diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java index c09e086..6c0c2ba 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java @@ -210,21 +210,17 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { List nodeUsers = nodeUserService.list(query); // 校验当前入参 checkPermission(nodeUsers); - // 过滤当前操作人员 - nodeUsers = nodeUsers.stream() - .filter(e -> !Objects.equals(e.getPersonId(), personId)) - .collect(Collectors.toList()); + if (CollUtil.isEmpty(nodeUsers)) { req.getPersonIds().forEach(e -> { BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo(); checkFailInfo.setType(CheckInfoTypeEnum.NOT_IN_JURISDICTION); addFailInfo(failInfoMap, e, checkFailInfo); }); - } - if (CollUtil.isEmpty(nodeUsers)) { transformFailMap(failInfoMap, resultList); return resultList; } + nodeUsers.stream().filter(e -> e.getIdentityType().equals(IdentityType.WORKER_LEADER.getCode())).findAny().ifPresent(e -> { BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo(); checkFailInfo.setType(CheckInfoTypeEnum.TEAM_LEADER);