wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(role-query): relation查询过滤ou和workspace

Browse Source
This commit is contained in:
zhansihu 2023-10-20 10:18:47 +08:00
parent 707e748a64
commit 5f702191dd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
View File

@ -462,7 +462,9 @@ public class RoleServiceImpl implements RoleService {
//反查relation
List<Long> roleIds = rolePage.getRecords().stream().map(SaasRole::getId).collect(Collectors.toList());
List<SaasRoleUserRelation> relationList = saasRoleUserRelationDao.list(new LambdaQueryWrapper<SaasRoleUserRelation>().
in(SaasRoleUserRelation::getRoleId, roleIds));
in(SaasRoleUserRelation::getRoleId, roleIds)
.eq(SaasRoleUserRelation::getOuId, req.getOuId())
.eq(SaasRoleUserRelation::getWorkspaceId, req.getWorkspaceId()));
Map<Long, List<SaasRoleUserRelation>> relationMap = relationList.stream().collect(Collectors.groupingBy(SaasRoleUserRelation::getRoleId));
// 结果组装 - 用户信息到yoke组装