tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改角色状态失败问题修复

Browse Source
This commit is contained in:
haoxr
2024-01-29 18:13:15 +08:00
parent 55502df532
commit 825f1fdfb3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
View File

@@ -43,7 +43,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
private final SysRoleMenuService roleMenuService; private final SysRoleMenuService roleMenuService;
private final SysUserRoleService userRoleService; private final SysUserRoleService userRoleService;
private final RoleConverter roleConverter; private final RoleConverter roleConverter;
private final PermissionService permissionService;
/** /**
* 角色分页列表 * 角色分页列表
@@ -129,7 +128,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
!StrUtil.equals(oldRole.getCode(), roleCode) || !StrUtil.equals(oldRole.getCode(), roleCode) ||
!ObjectUtil.equals(oldRole.getStatus(), roleForm.getStatus()) !ObjectUtil.equals(oldRole.getStatus(), roleForm.getStatus())
)) { )) {
permissionService.refreshRolePermsCache(oldRole.getCode(), roleCode); roleMenuService.refreshRolePermsCache(oldRole.getCode(), roleCode);
} }
} }
return result; return result;
@@ -160,10 +159,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
SysRole role = this.getById(roleId); SysRole role = this.getById(roleId);
Assert.isTrue(role != null, "角色不存在"); Assert.isTrue(role != null, "角色不存在");
role.setStatus(status);
boolean result = this.updateById(role); boolean result = this.updateById(role);
if (result) { if (result) {
// 刷新角色的权限缓存 // 刷新角色的权限缓存
permissionService.refreshRolePermsCache(role.getCode()); roleMenuService.refreshRolePermsCache(role.getCode());
} }
return result; return result;
} }
@@ -186,13 +186,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
Assert.isTrue(role != null, "角色不存在"); Assert.isTrue(role != null, "角色不存在");
// 判断角色是否被用户关联 // 判断角色是否被用户关联
boolean isRoleAssigned = userRoleService.isRoleAssignedToUser(roleId); boolean isRoleAssigned = userRoleService.hasAssignedUsers(roleId);
Assert.isTrue(!isRoleAssigned, "角色【{}】已分配用户，请先解除关联后删除", role.getName()); Assert.isTrue(!isRoleAssigned, "角色【{}】已分配用户，请先解除关联后删除", role.getName());
boolean deleteResult = this.removeById(roleId); boolean deleteResult = this.removeById(roleId);
if (deleteResult) { if (deleteResult) {
// 删除成功，刷新权限缓存 // 删除成功，刷新权限缓存
permissionService.refreshRolePermsCache(role.getCode()); roleMenuService.refreshRolePermsCache(role.getCode());
} }
} }
return true; return true;
@@ -238,7 +238,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
} }
// 刷新角色的权限缓存 // 刷新角色的权限缓存
permissionService.refreshRolePermsCache(role.getCode()); roleMenuService.refreshRolePermsCache(role.getCode());
return true; return true;
} }