From 77f33bde086734eb4d9123f054799b6d4deae1b8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 26 Jul 2018 17:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=A0=E9=99=A4=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/framework/web/service/PermissionService.java   | 9 +--------
 src/main/resources/mybatis/system/DeptMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index 013deca0..babc40a9 100644
--- a/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/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 true;
-        }
-        else
-        {
-            return false;
-        }
+        return SecurityUtils.getSubject().isPermitted(permission);
     }
 
 }
diff --git a/src/main/resources/mybatis/system/DeptMapper.xml b/src/main/resources/mybatis/system/DeptMapper.xml
index 193ef2cb..1209aaef 100644
--- a/src/main/resources/mybatis/system/DeptMapper.xml
+++ b/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">