jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 部门与角色如果绑定了用户则不允许禁用

Browse Source
This commit is contained in:
疯狂的狮子Li
2023-08-07 18:13:49 +08:00
parent ebef89be62
commit dc752ade25
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -268,6 +268,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
*/
@Override
public int updateRoleStatus(SysRole role) {
if (UserConstants.ROLE_DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) {
throw new ServiceException("角色已分配，不能禁用!");
}
return baseMapper.updateById(role);
}
@ -360,7 +363,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
checkRoleAllowed(role);
checkRoleDataScope(roleId);
if (countUserRoleByRoleId(roleId) > 0) {
throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
throw new ServiceException(String.format("%1$s已分配，不能删除!", role.getRoleName()));
}
}
List<Long> ids = Arrays.asList(roleIds);