From 0957c5458a9ade15c7a59ebc3dd8260bdbd6b26e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 10:35:28 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 14 +++++++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index fe718c8..9df6542 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -260,8 +260,20 @@
pole.setUserId(-1L);
}
);
- //鍒犻櫎
+
+ //鍒犻櫎鐢ㄦ埛鍚庨渶瑕佽嚜鍔ㄨВ缁戣鐢ㄦ埛鐨勮澶�
+
+ //鐏潌id闆嗗悎
+ List<Long> collect = poles.stream().map(p -> p.getId()).collect(Collectors.toList());
+ List<Long> collect1 = poles.stream().map(Pole::getId).collect(Collectors.toList());
+ //鍒犻櫎缁戝畾鍏崇郴
+ SpringContextHolder.getBean(PoleBindingService.class)
+ .remove(Wrappers.lambdaQuery(PoleBinding.class)
+ .in(PoleBinding::getPoleId, collect));
+ //鏇存敼鐏潌褰掑睘
flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles);
+
+
//鍒犻櫎澶辫触鍥炴粴鏁版嵁
if (!flag) {
throw new BusinessException("鍒犻櫎鐢ㄦ埛澶辫触锛�");
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 e82b12f..3d35427 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
@@ -56,8 +56,8 @@
throw new BusinessException("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
}
List<Long> roleIdList = roles.stream().map(Role::getId).collect(Collectors.toList());
- List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
- .stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
+ List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList)
+ .select(RoleMenuRelation::getMenuId)).stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
Set<String> menuPermissions = new HashSet<>();
// 鑿滃崟鏉冮檺
--
Gitblit v1.9.3