部门删除校验条件修改

src/main/java/com/ruoyi/framework/web/service/PermissionService.java

@@ -18,14 +18,7 @@ public class PermissionService
 
     private boolean isPermittedOperator(String permission)
     {
-        if (SecurityUtils.getSubject().isPermitted(permission))
+        return SecurityUtils.getSubject().isPermitted(permission);
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
     }
 
 }

src/main/resources/mybatis/system/DeptMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 	
 	<select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(*) from sys_user where dept_id = #{deptId}
+		select count(*) from sys_user where dept_id = #{deptId} and del_flag = '0'
 	</select>
 	
 	<select id="selectDeptCount" parameterType="Dept" resultType="int">