fix(sj_1.0.0): 角色判断,角色ID可能为空

This commit is contained in:
dhb52 2024-05-27 23:25:11 +08:00 committed by opensnail
parent 285ead5518
commit 94923462ba
2 changed files with 9 additions and 1 deletions

View File

@ -40,6 +40,14 @@ public enum RoleEnum {
return enumTypeMap;
}
public static boolean isAdmin(Integer roleId) {
return ADMIN.getRoleId().equals(roleId);
}
public static boolean isUser(Integer roleId) {
return USER.getRoleId().equals(roleId);
}
public Integer getRoleId() {
return roleId;
}

View File

@ -57,7 +57,7 @@ public class SystemUserController {
@LoginRequired(role = RoleEnum.ADMIN)
@PutMapping("/user")
public void update(@RequestBody @Valid SystemUserRequestVO requestVO) {
if (requestVO.getId() == SUPER_ADMIN_ID && requestVO.getRole().equals(RoleEnum.USER.getRoleId())) {
if (requestVO.getId() == SUPER_ADMIN_ID && RoleEnum.isAdmin(requestVO.getRole())) {
throw new SnailJobServerException("不允许修改超级管理员角色");
}
systemUserService.update(requestVO);