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

feat(REQ-3714): 不过滤当前操作人

Browse Source
This commit is contained in:
zhanghonghao 2025-03-12 21:14:43 +08:00
parent f4a85a986f
commit 04bf864e93
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,21 +210,17 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
List<NodeUserDTO> nodeUsers = nodeUserService.list(query); List<NodeUserDTO> nodeUsers = nodeUserService.list(query);
// 校验当前入参 // 校验当前入参
checkPermission(nodeUsers); checkPermission(nodeUsers);
// 过滤当前操作人员
nodeUsers = nodeUsers.stream()
.filter(e -> !Objects.equals(e.getPersonId(), personId))
.collect(Collectors.toList());
if (CollUtil.isEmpty(nodeUsers)) { if (CollUtil.isEmpty(nodeUsers)) {
req.getPersonIds().forEach(e -> { req.getPersonIds().forEach(e -> {
BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo(); BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo();
checkFailInfo.setType(CheckInfoTypeEnum.NOT_IN_JURISDICTION); checkFailInfo.setType(CheckInfoTypeEnum.NOT_IN_JURISDICTION);
addFailInfo(failInfoMap, e, checkFailInfo); addFailInfo(failInfoMap, e, checkFailInfo);
}); });
}
if (CollUtil.isEmpty(nodeUsers)) {
transformFailMap(failInfoMap, resultList); transformFailMap(failInfoMap, resultList);
return resultList; return resultList;
} }
nodeUsers.stream().filter(e -> e.getIdentityType().equals(IdentityType.WORKER_LEADER.getCode())).findAny().ifPresent(e -> { nodeUsers.stream().filter(e -> e.getIdentityType().equals(IdentityType.WORKER_LEADER.getCode())).findAny().ifPresent(e -> {
BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo(); BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo();
checkFailInfo.setType(CheckInfoTypeEnum.TEAM_LEADER); checkFailInfo.setType(CheckInfoTypeEnum.TEAM_LEADER);