From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
index f95fd27..e82b12f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -81,7 +81,8 @@
*/
public List<Role> listByAdminId(Long adminId) {
// 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
- List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
+ List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class)
+ .eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
List<Long> roleIdList = list.stream().map(AdminRoleRelation::getRoleId).collect(Collectors.toList());
if (CollectionUtil.isEmpty(roleIdList)) {
return null;
@@ -113,11 +114,13 @@
//璁剧疆瑙掕壊鏉冮檺绛夌骇
if (param.getLevel() != null) {
if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
- role.setLevel(RoleLevelStatus.SUPER.getCode());
+ throw new BusinessException("鏃犳硶娣诲姞瓒呯骇绠＄悊鍛樿鑹�");
} else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
role.setLevel(RoleLevelStatus.COMMON.getCode());
} else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL2.getCode());
} else {
role.setLevel(RoleLevelStatus.NORMAL.getCode());
}
@@ -140,24 +143,33 @@
if (role == null) {
throw new BusinessException("鎵句笉鍒拌鑹蹭俊鎭�");
}
+ //鍒ゆ柇鏄湁鏉冮檺淇敼
assertLevels(role.getLevel());
role.setName(param.getName());
role.setRemark(param.getRemark());
- //璁剧疆瑙掕壊鏉冮檺绛夌骇
- if (param.getLevel() != null) {
- if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
- role.setLevel(RoleLevelStatus.SUPER.getCode());
- } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
- role.setLevel(RoleLevelStatus.COMMON.getCode());
- } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
- role.setLevel(RoleLevelStatus.NORMAL.getCode());
+
+ if (!role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ //璁剧疆瑙掕壊鏉冮檺绛夌骇
+ if (param.getLevel() != null) {
+ if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("鏃犳硶淇敼鎴愯秴绾х鐞嗗憳瑙掕壊");
+ } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
+ role.setLevel(RoleLevelStatus.COMMON.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL2.getCode());
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
} else {
role.setLevel(RoleLevelStatus.NORMAL.getCode());
}
- } else {
- role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ } else if (!param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("瓒呯骇绠＄悊鍛樿鑹茬瓑绾ф棤娉曚慨鏀癸紒");
}
+
if (!updateById(role)) {
throw new BusinessException("缂栬緫瑙掕壊澶辫触");
@@ -222,13 +234,6 @@
}
List<RoleDetail> list = baseMapper.listRole(roleIdList);
- for (RoleDetail roleDetail : list) {
- if (roleDetail.getId() == 1) {
- roleDetail.setMenuIdList(menuMapper.listMenu());
-
- break;
- }
- }
return list;
}
--
Gitblit v1.9.3