From 886a1a10a06c77f215a2ce3fd735939e8e641f47 Mon Sep 17 00:00:00 2001 From: yangsong Date: Fri, 20 Oct 2023 11:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/server/service/impl/RoleUserService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index d527c9d6..915a3877 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -207,7 +207,10 @@ public class RoleUserService implements SaasRoleUserService { if (CollectionUtils.isEmpty(relations)) { return Collections.emptyList(); } - return relations.stream().map(r -> { + List roleIds = relations.stream().map(SaasRoleUserRelation::getRoleId).collect(Collectors.toList()); + List roles = saasRoleDao.lambdaQuery().in(SaasRole::getId, roleIds).eq(SaasRole::getRoleType, RoleTypeEnum.SUPER_ADMIN.getValue()).eq(SaasRole::getIsDelete, TableIsDeleteEnum.NORMAL.value).list(); + Set superAdminRoleIds = roles.stream().map(SaasRole::getId).collect(Collectors.toSet()); + return relations.stream().filter(r -> superAdminRoleIds.contains(r.getRoleId())).map(r -> { SuperAdminInfoDTO superAdminInfo = new SuperAdminInfoDTO(); superAdminInfo.setWorkspaceId(r.getWorkspaceId()); superAdminInfo.setOuId(r.getOuId());