hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-29 17:28:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

新建角色的时候，不允许创建 ADMIN 标识的角色

Browse Source
This commit is contained in:
YunaiV
2022-02-23 19:28:59 +08:00
parent 848fcdf329
commit 95bb9744c1
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
View File

@@ -31,7 +31,8 @@ public interface ErrorCodeConstants {
ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1002003001, "已经存在名为【{}】的角色"); ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1002003001, "已经存在名为【{}】的角色");
ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002003002, "已经存在编码为【{}】的角色"); ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002003002, "已经存在编码为【{}】的角色");
ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1002003004, "不能操作类型为系统内置的角色"); ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1002003004, "不能操作类型为系统内置的角色");
ErrorCode ROLE_IS_DISABLE = new ErrorCode(1002003004, "名字为【{}】的角色已被禁用"); ErrorCode ROLE_IS_DISABLE = new ErrorCode(1002003005, "名字为【{}】的角色已被禁用");
ErrorCode ROLE_ADMIN_CODE_ERROR = new ErrorCode(1002003006, "编码【{}】不能使用");
// ========== 用户模块 1002004000 ========== // ========== 用户模块 1002004000 ==========
ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1002004000, "用户账号已经存在"); ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1002004000, "用户账号已经存在");

5
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleCodeEnum.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.enums.permission; package cn.iocoder.yudao.module.system.enums.permission;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@@ -23,4 +24,8 @@ public enum RoleCodeEnum {
*/ */
private final String name; private final String name;
public static boolean isSuperAdmin(String code) {
return ObjectUtils.equalsAny(code, SUPER_ADMIN.getCode());
}
} }

10
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class RoleServiceImpl implements RoleService {
@Override @Override
public void updateRole(RoleUpdateReqVO reqVO) { public void updateRole(RoleUpdateReqVO reqVO) {
// 校验是否可以更新 // 校验是否可以更新
this.checkUpdateRole(reqVO.getId()); checkUpdateRole(reqVO.getId());
// 校验角色的唯一字段是否重复 // 校验角色的唯一字段是否重复
checkDuplicateRole(reqVO.getName(), reqVO.getCode(), reqVO.getId()); checkDuplicateRole(reqVO.getName(), reqVO.getCode(), reqVO.getId());
// 更新到数据库 // 更新到数据库
@@ -149,7 +149,7 @@ public class RoleServiceImpl implements RoleService {
@Override @Override
public void updateRoleStatus(Long id, Integer status) { public void updateRoleStatus(Long id, Integer status) {
// 校验是否可以更新 // 校验是否可以更新
this.checkUpdateRole(id); checkUpdateRole(id);
// 更新状态 // 更新状态
RoleDO updateObject = new RoleDO(); RoleDO updateObject = new RoleDO();
updateObject.setId(id); updateObject.setId(id);
@@ -217,7 +217,7 @@ public class RoleServiceImpl implements RoleService {
if (CollectionUtil.isEmpty(roleList)) { if (CollectionUtil.isEmpty(roleList)) {
return false; return false;
} }
return roleList.stream().anyMatch(roleDO -> RoleCodeEnum.SUPER_ADMIN.getCode().equals(roleDO.getCode())); return roleList.stream().anyMatch(role -> RoleCodeEnum.isSuperAdmin(role.getCode()));
} }
@Override @Override
@@ -247,6 +247,10 @@ public class RoleServiceImpl implements RoleService {
*/ */
@VisibleForTesting @VisibleForTesting
public void checkDuplicateRole(String name, String code, Long id) { public void checkDuplicateRole(String name, String code, Long id) {
// 0. 超级管理员，不允许创建
if (RoleCodeEnum.isSuperAdmin(code)) {
throw exception(ROLE_ADMIN_CODE_ERROR, code);
}
// 1. 该 name 名字被其它角色所使用 // 1. 该 name 名字被其它角色所使用
RoleDO role = roleMapper.selectByName(name); RoleDO role = roleMapper.selectByName(name);
if (role != null && !role.getId().equals(id)) { if (role != null && !role.getId().equals(id)) {