From a4e61f1801f3b7c426ec0d0f359d9fd8a29813f7 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Tue, 26 Jan 2021 09:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=A4=E4=B8=AA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/system/controller/SysUserController.java      | 8 ++++----
 ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 6a8f38bc8..c14df3c26 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -193,8 +193,8 @@ public class SysUserController extends BaseController {
             for (int i = 0; i < roleIds.length; i++) {
                 if (roleIds[i] == 100) {
                     iCount = userService.countUserSchoolAdminRoleByDeptId(user.getDeptId(), roleIds[i]);
-                    if (iCount >= 3) {
-                        return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，当前学校管理员角色最多设置3人");
+                    if (iCount >= 2) {
+                        return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，当前学校管理员角色最多设置2人");
                     }
                 }
             }
@@ -254,8 +254,8 @@ public class SysUserController extends BaseController {
                 for (int i = 0; i < roleIds.length; i++) {
                     if (roleIds[i] == 100) {
                         iCount = userService.countUserSchoolAdminRoleByDeptId(user.getDeptId(), roleIds[i]);
-                        if (iCount >= 3) {
-                            return AjaxResult.error("用户'" + user.getUserName() + "'修改失败，当前学校管理员角色最多设置3人");
+                        if (iCount >= 2) {
+                            return AjaxResult.error("用户'" + user.getUserName() + "'修改失败，当前学校管理员角色最多设置2人");
                         }
                     }
                 }
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
index 3c36e1bf4..a3f55a9af 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="countUserSchoolAdminRoleByDeptId" resultType="Integer">
 	    select count(1) from sys_user u left join sys_user_role r on u.user_id=r.user_id
-        where dept_id=#{deptId} and role_id=#{roleId}
+        where dept_id=#{deptId} and role_id=#{roleId} and u.status='0' and u.del_flag = '0'
 	</select>
 	
 	<sql id="selectUserVo">