From 073a8ef8b3372141a8a77d8f0220fb0dec5352ea Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 48e2a86..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;
--
Gitblit v1.9.3