From 15997039a86e7a00b6140af1a03152c6a3f310bd Mon Sep 17 00:00:00 2001
From: zhanghonghao <zhanghonghao@axzo.cn>
Date: Tue, 11 Mar 2025 11:12:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E4=BD=BF=E7=94=A8topNodeIds?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foundation/impl/NodeUserFoundationServiceImpl.java   | 9 ++++++---
 .../server/nodeuser/foundation/req/NodeUserDelete.java   | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java
index 8a28e4c..e73b7c2 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java
@@ -161,9 +161,12 @@ public class NodeUserFoundationServiceImpl implements NodeUserFoundationService
     @Override
     public List<OrganizationalNodeUser> delete(NodeUserDelete req) {
         checkDeleteReq(req);
-        List<NodeUserQueryRepository.NodeUserResp> list = nodeUserQueryRepository.list(
-                NodeUserQueryRepository.ListReq.builder().organizationalUnitId(req.getOuId())
-                .workspaceId(req.getWorkspaceId()).personIds(req.getPersonIds()).identityType(req.getIdentityType()).build());
+        List<NodeUserQueryRepository.NodeUserResp> list =
+                nodeUserQueryRepository.list(
+                        NodeUserQueryRepository.ListReq.builder()
+                                .organizationalUnitId(req.isUnitDelete() ? req.getOuId() : null)
+                                .workspaceId(req.isUnitDelete() ? null : req.getWorkspaceId()).personIds(req.getPersonIds())
+                                .topNodeIds(req.getTopNodeIds()).identityType(req.getIdentityType()).build());
         if (CollUtil.isEmpty(list)) {
             return CollUtil.newArrayList();
         }
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/req/NodeUserDelete.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/req/NodeUserDelete.java
index 689f1f4..9244213 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/req/NodeUserDelete.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/req/NodeUserDelete.java
@@ -33,6 +33,11 @@ public class NodeUserDelete {
      */
     private Integer identityType;
 
+    /**
+     * 顶级节点
+     */
+    private List<Long> topNodeIds;
+
     public OrganizationalNodeUser toEntity() {
         return BeanUtil.toBean(this, OrganizationalNodeUser.class);
     }