From 7471fa7ee0cfcd1cd922d652b98223b97e8aed12 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 6 Jun 2025 09:45:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=A0=B9=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=8A=9E=E7=90=86=E4=BA=BA=E6=9D=83=E9=99=90=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/system/SysDeptController.java | 3 +++ .../service/impl/FlwTaskAssigneeServiceImpl.java | 13 ++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 45b841850..4184a973d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -113,6 +113,9 @@ public class SysDeptController extends BaseController { @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") public R remove(@PathVariable Long deptId) { + if (StringUtils.equals(SystemConstants.ROOT_DEPT_ANCESTORS, String.valueOf(deptId))) { + return R.warn("根部门不允许删除"); + } if (deptService.hasChildByDeptId(deptId)) { return R.warn("存在下级部门,不允许删除"); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index 3009e0a1d..04d4c6cb4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -106,15 +106,10 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand .map(entry -> { String storageId = entry.getKey(); Pair parsed = entry.getValue(); - String handlerName = "格式错误"; - if (parsed != null) { - Map nameMapping = nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap()); - handlerName = nameMapping.getOrDefault(parsed.getValue(), "未知名称"); - } - HandlerFeedBackVo backVo = new HandlerFeedBackVo(); - backVo.setStorageId(storageId); - backVo.setHandlerName(handlerName); - return backVo; + String handlerName = (parsed == null) ? null + : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap()) + .get(parsed.getValue()); + return new HandlerFeedBackVo(storageId, handlerName); }).toList(); }