GTsoft/RuoYi-Vue-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化根部门不允许删除以及办理人权限名称回显

Browse Source
This commit is contained in:
AprilWind 2025-06-06 09:45:06 +08:00
parent 529f1e5dbb
commit 7471fa7ee0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java
View File

@ -113,6 +113,9 @@ public class SysDeptController extends BaseController {
@Log(title = "部门管理", businessType = BusinessType.DELETE) @Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}") @DeleteMapping("/{deptId}")
public R<Void> remove(@PathVariable Long deptId) { public R<Void> remove(@PathVariable Long deptId) {
if (StringUtils.equals(SystemConstants.ROOT_DEPT_ANCESTORS, String.valueOf(deptId))) {
return R.warn("根部门不允许删除");
}
if (deptService.hasChildByDeptId(deptId)) { if (deptService.hasChildByDeptId(deptId)) {
return R.warn("存在下级部门,不允许删除"); return R.warn("存在下级部门,不允许删除");
} }

13
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
View File

@ -106,15 +106,10 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
.map(entry -> { .map(entry -> {
String storageId = entry.getKey(); String storageId = entry.getKey();
Pair<TaskAssigneeEnum, Long> parsed = entry.getValue(); Pair<TaskAssigneeEnum, Long> parsed = entry.getValue();
String handlerName = "格式错误"; String handlerName = (parsed == null) ? null
if (parsed != null) { : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap())
Map<Long, String> nameMapping = nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap()); .get(parsed.getValue());
handlerName = nameMapping.getOrDefault(parsed.getValue(), "未知名称"); return new HandlerFeedBackVo(storageId, handlerName);
}
HandlerFeedBackVo backVo = new HandlerFeedBackVo();
backVo.setStorageId(storageId);
backVo.setHandlerName(handlerName);
return backVo;
}).toList(); }).toList();
} }