修改用户信息限制管理员数量

src/main/java/cn/chnmuseum/party/web/controller/TUserController.java

@@ -75,6 +75,12 @@ public class TUserController extends BaseController {
     //用户登录是否被锁定    一小时 redisKey 前缀
     private String SHIRO_IS_LOCK = "shiro_is_lock_";
 
+    // 用户的管理员类型平台管理员、互动审核员
+    private String ROLE_PTGLY = "2";
+    private String ROLE_HDSHY = "17";
+
+
+
     @ApiOperation(value = "获取用户分页列表")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
@@ -386,11 +392,6 @@ public class TUserController extends BaseController {
                     }
                 }
                 if ("2".equals(user.getType())) {
-                    if (StringUtils.isBlank(user.getRoleId())) {
-                        resultMap.put("resultCode", "400");
-                        resultMap.put("message", "请选择管理员账号类型");
-                        return resultMap;
-                    }
                     user.setUserName(user.getUserName().trim());
                     Map<String, Object> map = new HashMap<>();
                     map.put("is_deleted", false);
@@ -413,16 +414,21 @@ public class TUserController extends BaseController {
                     **/
 
                     TUser tUser = userService.getById(user.getId());
-                    if ("2".equals(user.getRoleId()) && list.size() >= 2 && !tUser.getOrgId().equals(user.getOrgId())) {
+                    if (ROLE_PTGLY.equals(user.getRoleId()) && list.size() >= 2 && !tUser.getOrgId().equals(user.getOrgId())) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在两个单位管理员！");
                         return resultMap;
                     }
-                    if ("17".equals(user.getRoleId()) && list.size() >= 1 && !tUser.getOrgId().equals(user.getOrgId())) {
+                    if (ROLE_HDSHY.equals(user.getRoleId()) && list.size() >= 1 && !tUser.getOrgId().equals(user.getOrgId())) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在一个互动审核员！");
                         return resultMap;
                     }
+                    if (StringUtils.isNotBlank(user.getRoleId())) {
+                        user.getRoleList().remove(ROLE_HDSHY);
+                        user.getRoleList().remove(ROLE_PTGLY);
+                        user.getRoleList().add(user.getRoleId());
+                    }
                 }
 //                user.setUserName(StringUtils.trimToNull(user.getUserName()));
 //                user.setPassword(StringUtils.trimToNull(user.getPassword()));