From f9cc9d050c50ff21f098315708f3ab4dc6ad6e9c Mon Sep 17 00:00:00 2001
From: zhanghonghao <zhanghonghao@axzo.cn>
Date: Mon, 10 Mar 2025 17:43:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E5=A4=84=E7=90=86workspaceCh?=
 =?UTF-8?q?eck?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeuser/service/impl/NodeUserCheckServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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