优化代码结构

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

@@ -82,7 +82,8 @@ public enum BASE_RESP_CODE_ENUM {
     ROLE_CANNOTBE_EMPTY("662", "设置的角色不能为空"),
     NOADMIN_ISTRATIVE_RIGHTS("663", "设置的负责人没有管理权限"),
     CHOOSEATLEASTONEROLE("667", "至少保留一个角色"),
-    DOWNLOAD_ERROR("668","下载出错")
+    DOWNLOAD_ERROR("668", "下载出错"),
+    PLEASE_CANCELTHE_MANAGEMENTROLE("669", "注销账号，请取消管理角色"),
     ;
 
 

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

@@ -212,7 +212,6 @@ public class WorkUserServiceImpl implements WorkUserService {
     @Override
     public Boolean modifyRole(Integer userId, List<Integer> roleIds, Integer status, Integer submitOrder) {
         log.info("WorkUserServiceImpl[]modifyRole[].input.param.userId:{},roleIds:{},status:{},submitOrder:{}" + userId, roleIds, status, submitOrder);
-        PageHelper.clearPage();
         if (CollectionUtils.isEmpty(roleIds)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.CHOOSEATLEASTONEROLE);
         }
@@ -226,6 +225,7 @@ public class WorkUserServiceImpl implements WorkUserService {
         if (null == workUser) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);
         }
+
         WorkDept workDept = workDeptService.getById(workUser.getDeptId());
         WorkCentre centre = workCentreService.getCentreById(workDept.getCentreId());
         List<Integer> roles = workUserRoleMapper.getRole(userId);
@@ -282,6 +282,14 @@ public class WorkUserServiceImpl implements WorkUserService {
                 workCentreService.updateById(centre);
             }
         }
+        if (null != status && status == 0 && !CollectionUtils.isEmpty(roleIds)) {
+            if (roleIds.size() == 1 && roleIds.get(0).equals(0)) {
+
+            }else{
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.PLEASE_CANCELTHE_MANAGEMENTROLE);
+            }
+        }
+
         workUserRoleMapper.insertBatch(userId, roleIds);
         return true;
     }