优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -283,14 +283,13 @@ public class WorkUserServiceImpl implements WorkUserService {
                     workCentreService.updateById(centre);
                 }
             }
-
-        }else {
-            int roleCountByRoleId = UserRoleLevelUtils.getRoleCountByRoleId(4,userId);
-            if (roleCountByRoleId == 0) {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.ATLEASTONEADMINISTRATORISREQUIRED);
-            }
         }
         workUserRoleMapper.insertBatch(userId, roleIds);
+        // 判断管理员是否至少有一个
+        int roleCountByRoleId = UserRoleLevelUtils.getRoleCountByRoleId(4);
+        if (roleCountByRoleId == 0) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.ATLEASTONEADMINISTRATORISREQUIRED);
+        }
         return true;
     }
 

wisenergy-service/src/main/java/cn/wisenergy/service/utils/UserRoleLevelUtils.java

@@ -200,20 +200,15 @@ public class UserRoleLevelUtils {
         return ranks;
     }
 
-    public static int getRoleCountByRoleId(Integer roleId,Integer userId) {
+    public static int getRoleCountByRoleId(Integer roleId) {
         if (null == roleId) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         List<WorkUser> users = utils.workUserRoleMapper.getUserRoleDeptDtoByRoleId(roleId);
-        int i = 0;
         if (!CollectionUtils.isEmpty(users)) {
-            for (WorkUser user : users) {
-                if (!user.getId().equals(userId)) {
-                    i++;
-                }
-            }
+            return users.size();
         }
-        return i;
+        return 0;
     }
 
 }