From 2d4afbbcfda71f826ed532d01de860395c4da2b6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 14:40:36 +0800
Subject: [PATCH] 角色等级FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 09727b8..f95fd27 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
@@ -110,7 +110,21 @@
Role role = new Role();
role.setName(param.getName());
role.setRemark(param.getRemark());
- role.setLevel(RoleLevelStatus.COMMON.getCode());
+ //璁剧疆瑙掕壊鏉冮檺绛夌骇
+ 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());
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+
if (!save(role)) {
throw new BusinessException("娣诲姞瑙掕壊澶辫触");
}
@@ -127,11 +141,25 @@
throw new BusinessException("鎵句笉鍒拌鑹蹭俊鎭�");
}
assertLevels(role.getLevel());
- Role update = new Role();
- update.setId(roleId);
- update.setName(param.getName());
- update.setRemark(param.getRemark());
- if (!updateById(update)) {
+
+ 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());
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+
+ if (!updateById(role)) {
throw new BusinessException("缂栬緫瑙掕壊澶辫触");
}
roleMenuRelationService.remove(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, roleId));
@@ -178,6 +206,10 @@
if (CollectionUtil.isNotEmpty(list)) {
throw new BusinessException("褰撳墠瑙掕壊鏈夌鐞嗗憳浣跨敤锛屾棤娉曞垹闄�");
}
+ List<ClientRoleRelation> listClient = clientRoleRelationService.list(Wrappers.lambdaQuery(ClientRoleRelation.class).eq(ClientRoleRelation::getRoleId, role));
+ if (CollectionUtil.isNotEmpty(listClient)) {
+ throw new BusinessException("褰撳墠瑙掕壊鏈夌敤鎴蜂娇鐢紝鏃犳硶鍒犻櫎");
+ }
roleMenuRelationService.remove(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, roleId));
return removeById(roleId);
}
--
Gitblit v1.9.3