From 1564001257e6732395d3977104e73bdf54ca3148 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sat, 22 Jan 2022 14:45:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=BF=E6=8D=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=90=E9=83=A8=E9=97=A8=E6=95=B0=E4=B8=AD?=
 =?UTF-8?q?=E9=AD=94=E6=B3=95=E5=80=BC=E4=B8=BA=E5=B7=B2=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=9A=84=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/system/SysDeptController.java  | 2 +-
 .../main/java/com/ruoyi/system/service/ISysDeptService.java | 4 ++--
 .../com/ruoyi/system/service/impl/SysDeptServiceImpl.java   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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<SysDept>()
+    public long selectNormalChildrenDeptById(Long deptId) {
+        return baseMapper.selectCount(new LambdaQueryWrapper<SysDept>()
             .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL)
             .apply("find_in_set({0}, ancestors)", deptId));
     }