diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 673fa7d..b222401 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -272,6 +272,17 @@ public class RolesController extends BaseController { return; } + //如果有数据不能删除 + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setRoleId(id); + userRoleMapsQuery.setYn(YnEnums.YES.getId()); + Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery); + if(count > 0) { + ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据,不能删除"); + return; + } + + Roles roles = rolesService.getRoles(id); if (roles == null) { ResultUtils.buildIdResultData(response); @@ -283,16 +294,6 @@ public class RolesController extends BaseController { rolesService.updateRoles(roles); - //如果有数据不能删除 - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); - userRoleMapsQuery.setRoleId(id); - userRoleMapsQuery.setYn(YnEnums.YES.getId()); - Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery); - if(count > 0) { - ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据,不能删除"); - return; - } - //角色权限设置为无效 RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setRoleId(id);