From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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..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;
@@ -110,7 +111,23 @@
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())) {
+ 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());
+ }
+
if (!save(role)) {
throw new BusinessException("娣诲姞瑙掕壊澶辫触");
}
@@ -126,12 +143,35 @@
if (role == null) {
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 (!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 if (!param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("瓒呯骇绠＄悊鍛樿鑹茬瓑绾ф棤娉曚慨鏀癸紒");
+ }
+
+
+ if (!updateById(role)) {
throw new BusinessException("缂栬緫瑙掕壊澶辫触");
}
roleMenuRelationService.remove(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, roleId));
@@ -178,6 +218,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);
}
@@ -190,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