diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 11bc1ab60..f38758c6b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -121,7 +121,7 @@ public class SysDeptController extends BaseController { } else if (dept.getParentId().equals(dept.getDeptId())) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己"); } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.checkNormalChildrenDeptById(dept.getDeptId())) { + && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) { return AjaxResult.error("该部门包含未停用的子部门!"); } return toAjax(deptService.updateDept(dept)); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index d007fa6ea..8508d4f86 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -44,12 +44,12 @@ public interface ISysDeptService { SysDept selectDeptById(Long deptId); /** - * 根据ID查询所有子部门是否存在(正常状态) + * 根据ID查询所有子部门数(正常状态) * * @param deptId 部门ID * @return 子部门数 */ - boolean checkNormalChildrenDeptById(Long deptId); + long selectNormalChildrenDeptById(Long deptId); /** * 是否存在部门子节点 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 45bc4d670..0dd441baf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -92,14 +92,14 @@ public class SysDeptServiceImpl implements ISysDeptService { } /** - * 根据ID查询所有子部门是否存在(正常状态) + * 根据ID查询所有子部门数(正常状态) * * @param deptId 部门ID * @return 子部门数 */ @Override - public boolean checkNormalChildrenDeptById(Long deptId) { - return baseMapper.exists(new LambdaQueryWrapper() + public long selectNormalChildrenDeptById(Long deptId) { + return baseMapper.selectCount(new LambdaQueryWrapper() .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) .apply("find_in_set({0}, ancestors)", deptId)); }