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

feat:(REQ-2509) 修改角色用户关系支持pair配对查询

Browse Source
This commit is contained in:
lilong 2024-05-31 17:20:33 +08:00
parent 99b822cc2f
commit d61723aadd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
View File

@ -140,6 +140,17 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
QueryWrapper<SaasRoleUserRelation> wrapper = QueryWrapperHelper.fromBean(param, SaasRoleUserRelation.class);
wrapper.eq("is_delete", 0);
if (!CollectionUtils.isEmpty(param.getWorkspaceOuPairs())) {
wrapper.and(j -> {
for (ListRoleUserRelationParam.WorkspaceOuPair workspaceOuPair : param.getWorkspaceOuPairs()) {
j.or(k -> {
k.eq(Objects.nonNull(workspaceOuPair.getOuId()), "ou_id", workspaceOuPair.getOuId());
k.eq(Objects.nonNull(workspaceOuPair.getWorkspaceId()), "workspace_id", workspaceOuPair.getWorkspaceId());
});
}
});
}
IPage<SaasRoleUserRelation> page = this.page(PageConverter.toMybatis(param, SaasRoleUserRelation.class), wrapper);
Map<Long, SaasRoleUserV2DTO.SaasRoleUser> saasRoleUsers = listSaasRoleUser(param, page.getRecords());