优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -84,6 +84,7 @@ public enum BASE_RESP_CODE_ENUM {
     NON_PROJECT_OPPORTUNITYNUMBERNAME_ISEMPTY("664", "非项目,无商机属性"),
     THEPROJECT_HASBEEN_CLOSED("665", "该项目/商机已经结束，请重新选择填报"),
     THISTYPEOF_WORKINGHOURS_HASENDE("666", "该工时类型已经结束，请选择其他类型"),
+    CHOOSEATLEASTONEROLE("667", "至少保留一个角色"),
 
     ;
 

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

@@ -211,9 +211,15 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Boolean modifyRole(Integer userId, List<Integer> roleIds, Integer status) {
         log.info("WorkUserServiceImpl[]modifyRole[].input.param.userId:{},roleIds:{},status:{}" + userId, roleIds, status);
         PageHelper.clearPage();
+        if (CollectionUtils.isEmpty(roleIds)) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.CHOOSEATLEASTONEROLE);
+        }
         if (UserRoleLevelUtils.levelIsRepeat(roleIds)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEROLEPERMISSIONS);
         }
+        if (null == userId) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
         WorkUser workUser = workUserMapper.selectById(userId);
         if (null == workUser) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);