diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java index f13c0ad5e..75356dc41 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java @@ -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; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java index ce4dd4f3a..709d420bf 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java @@ -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);