优化代码结构

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkRole.java

@@ -19,6 +19,6 @@ public class WorkRole {
     @ApiModelProperty(name = "name",value = "角色名")
     private String name;
 
-    @ApiModelProperty(name = "onlyOne",value = "是否只能有一个：0：多个，1：一个")
+    @ApiModelProperty(name = "onlyOne",value = "大于0且相同就重复")
     private Integer onlyOne;
 }

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

@@ -215,7 +215,7 @@ public class WorkUserServiceImpl implements WorkUserService {
         if (CollectionUtils.isEmpty(roleIds)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.CHOOSEATLEASTONEROLE);
         }
-        if (UserRoleLevelUtils.levelIsRepeat(roleIds)) {
+        if (UserRoleLevelUtils.roleIsRepeat(roleIds)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEROLEPERMISSIONS);
         }
         if (null == userId) {

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

@@ -163,17 +163,19 @@ public class UserRoleLevelUtils {
     /**
      * 判断权限是否重复
      */
-    public static Boolean levelIsRepeat(List<Integer> roles) {
+    public static Boolean roleIsRepeat(List<Integer> roles) {
         if (CollectionUtils.isEmpty(roles)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.ROLE_CANNOTBE_EMPTY);
         }
-        List<Integer> getlevelIds = getlevelIds(roles);
-        Set<Integer> hashSet = new HashSet<>();
-        if (!CollectionUtils.isEmpty(getlevelIds)) {
-            for (Integer id : getlevelIds) {
-                if (!hashSet.add(id)){
-                    //有重复值
-                    return true;
+        List<WorkRole> workRoles = utils.workRoleMapper.selectBatchIds(roles);
+        if (CollectionUtils.isEmpty(workRoles)) {
+            Set<Integer> hashSet = new HashSet<>();
+            for (WorkRole workRole : workRoles) {
+                if (workRole.getOnlyOne()>0) {
+                    if (!hashSet.add(workRole.getOnlyOne())){
+                        //有重复值
+                        return true;
+                    }
                 }
             }
         }