github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

部门删除校验条件修改

pull/17/MERGE
RuoYi 2018-07-26 17:47:14 +08:00
parent 791c767aed
commit 43bde8362b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ruoyi/framework/web/service/PermissionService.java
View File

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

2
src/main/resources/mybatis/system/DeptMapper.xml
View File

@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int"> <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>
<select id="selectDeptCount" parameterType="Dept" resultType="int"> <select id="selectDeptCount" parameterType="Dept" resultType="int">