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

feat(REQ-3714): 处理workspaceCheck

Browse Source
This commit is contained in:
zhanghonghao 2025-03-10 17:43:34 +08:00
parent 2b4dfa50a8
commit f9cc9d050c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,6 +204,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
ListNodeUserReq query = ListNodeUserReq.builder() ListNodeUserReq query = ListNodeUserReq.builder()
.topNodeIds(nodeIds) .topNodeIds(nodeIds)
.personIds(nodePersonIds) .personIds(nodePersonIds)
.needs(ListNodeUserReq.Needs.builder().job(true).build())
.findByAncestorNodeId(true) .findByAncestorNodeId(true)
.build(); .build();
// 查询当前登录及待删除人员在当前项目中的参与记录（仅限当前登录单位） // 查询当前登录及待删除人员在当前项目中的参与记录（仅限当前登录单位）
@ -212,7 +213,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
checkPermission(nodeUsers, personId); checkPermission(nodeUsers, personId);
// 过滤当前操作人员 // 过滤当前操作人员
nodeUsers = nodeUsers.stream() nodeUsers = nodeUsers.stream()
.filter(e -> req.getPersonIds().contains(e.getPersonId())) .filter(e -> !req.getPersonIds().contains(personId))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtil.isEmpty(nodeUsers)) { if (CollectionUtil.isEmpty(nodeUsers)) {
req.getPersonIds().forEach(e -> { req.getPersonIds().forEach(e -> {
@ -303,6 +304,9 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
} }
private void checkIndependentGroupLeader(List<NodeUserDTO> nodeUsers, Map<Long, List<BatchDeleteNodeUserCheckResp.CheckFailInfo>> failInfoMap) { private void checkIndependentGroupLeader(List<NodeUserDTO> nodeUsers, Map<Long, List<BatchDeleteNodeUserCheckResp.CheckFailInfo>> failInfoMap) {
if (CollUtil.isEmpty(nodeUsers)) {
return;
}
Set<Long> nodeIdList = nodeUsers.stream().map(NodeUserDTO::getOrganizationalNodeId).collect(Collectors.toSet()); Set<Long> nodeIdList = nodeUsers.stream().map(NodeUserDTO::getOrganizationalNodeId).collect(Collectors.toSet());
ListNodeReq nodeBatchQueryVO = new ListNodeReq(); ListNodeReq nodeBatchQueryVO = new ListNodeReq();
nodeBatchQueryVO.setIds(nodeIdList); nodeBatchQueryVO.setIds(nodeIdList);