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

Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714

Browse Source
This commit is contained in:
zhangran 2025-03-21 10:30:30 +08:00
commit bb233e3c0d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
View File

@ -261,8 +261,11 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
roleUserParam.setNeedRole(true);
roleUserParam.setPageSize(1000);
Set<Long> identityIds = nodeUsers.stream().map(NodeUserDTO::getIdentityId).collect(Collectors.toSet());
List<RoleUserResp> saasRoleUserInfo = roleUserGateway.pageAll(roleUserParam);
saasRoleUserInfo = saasRoleUserInfo.stream().filter(e -> Objects.nonNull(e.getRole())).collect(Collectors.toList());
saasRoleUserInfo = saasRoleUserInfo.stream().filter(e -> Objects.nonNull(e.getRole()))
.filter(e -> identityIds.contains(e.getIdentityId())).collect(Collectors.toList());
saasRoleUserInfo.forEach(e -> {
// 班组长不用校验，因为班组长也会有管理员角色
if (teamLeadPersonSet.contains(e.getPersonId())) {