修改删除账号

cms-common/cms-common-util/src/main/java/com/mmc/iuav/response/ResultEnum.java

@@ -44,7 +44,9 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     UPDATE_OWNER_ROLE_MENUS_ERROR("8007", "禁止修改与当前登录账号角色相同的角色权限"),
     UPDATE_OWNER_ROLE_ERROR("8008", "禁止修改当前账号的角色"),
     UPDATE_ADMIN_ROLE_ERROR("8009", "禁止修改admin账号的角色"),
-    ONLY_ONE_ADMIN_ERROR("8010", "禁止该账号获取超级管理员角色");
+    ONLY_ONE_ADMIN_ERROR("8010", "禁止该账号获取超级管理员角色"),
+    DELETE_ADMIN_ERROR("8011", "禁止删除超级管理员角色账号"),
+    DELETE_YOURSELF_ERROR("8011", "禁止删除自己的账号");
 
     /**
      * 错误码

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -47,7 +47,7 @@ public class BackUserAccountController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("removeBAccount")
     public ResultBody disableBAccount(@RequestParam Integer userAccountId, HttpServletRequest request) {
-        return backUserAccountService.disableBAccount(userAccountId);
+        return backUserAccountService.disableBAccount(userAccountId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
     @ApiOperation(value = "账号-列表")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -34,10 +34,11 @@ public interface BackUserAccountService {
     /**
      * 禁用后台用户
      *
-     * @param userAccountId
+     * @param accountId
+     * @param backUserAccountId
      * @return
      */
-    ResultBody disableBAccount(Integer userAccountId);
+    ResultBody disableBAccount(Integer accountId, Integer backUserAccountId);
 
     /**
      * 后台用户列表

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -115,8 +115,15 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     }
 
     @Override
-    public ResultBody disableBAccount(Integer userAccountId) {
-        backUserAccountDao.disableBackUserAccountDO(userAccountId);
+    public ResultBody disableBAccount(Integer accountId, Integer backUserAccountId) {
+        RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(accountId);
+        if (roleInfoDO.getSuperAdmin().equals(RoleEnums.ADMIN.getId())) {
+            return ResultBody.error(ResultEnum.DELETE_ADMIN_ERROR);
+        }
+        if (accountId.toString().equals(backUserAccountId.toString())) {
+            return ResultBody.error(ResultEnum.DELETE_YOURSELF_ERROR);
+        }
+        backUserAccountDao.disableBackUserAccountDO(accountId);
         return ResultBody.success();
     }