From ad7dcdd3020be007bcc5549c2f2abcbc85592ef6 Mon Sep 17 00:00:00 2001
From: zhanghonghao <zhanghonghao@axzo.cn>
Date: Mon, 6 Jan 2025 14:59:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3488):=20node=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0platTeamIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orgmanax/dto/node/req/ListNodeReq.java    | 26 ++++++++++++++-----
 .../service/impl/ProjectTeamServiceImpl.java  |  1 +
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
index 06facd4..7af7baf 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
@@ -51,18 +51,21 @@ public class ListNodeReq extends PageReqV2 {
      * 指定部门类型
      */
     @Builder.Default
-    private Set<Integer> includeOrgNodeTypes = Collections.emptySet();;
+    private Set<Integer> includeOrgNodeTypes = Collections.emptySet();
+    ;
     /**
      * 排除部门类型
      */
     @Builder.Default
-    private Set<Integer> excludeOrgNodeTypes = Collections.emptySet();;
+    private Set<Integer> excludeOrgNodeTypes = Collections.emptySet();
+    ;
 
     /**
      * 顶级节点ID集合
      */
     @Builder.Default
-    private Set<Long> topNodeIds = Collections.emptySet();;
+    private Set<Long> topNodeIds = Collections.emptySet();
+    ;
 
     /**
      * 是否包含祖先节点
@@ -116,23 +119,32 @@ public class ListNodeReq extends PageReqV2 {
      * 根据workspace和ouId组合查询
      */
     @Builder.Default
-    private Set<WorkspaceOuPair> workspaceOuPairs = Collections.emptySet();;
+    private Set<WorkspaceOuPair> workspaceOuPairs = Collections.emptySet();
+    ;
 
     /**
      * 项目id集合
      */
     @Builder.Default
-    private Set<Long> workspaceIds = Collections.emptySet();;
+    private Set<Long> workspaceIds = Collections.emptySet();
 
     /**
      * 岗位编码
      */
     @Builder.Default
-    private Set<String> jobCodes = Collections.emptySet();;
+    private Set<String> jobCodes = Collections.emptySet();
+    ;
 
     /**
      * 当前用户personId
      */
     private Long personId;
 
-}
+    /**
+     * 平台班组id
+     * todo 未实现
+     */
+    @Builder.Default
+    private Set<Long> platTeamIds = Collections.emptySet();
+
+}
\ No newline at end of file
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
index bbb464f..08337ff 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
@@ -38,6 +38,7 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
                 .includeOrgNodeTypes(includeOrgNodeTypes)
                 .ids(req.getOrganizationalNodeIdList())
                 .ouIds(req.getOuIds())
+                .platTeamIds(req.getPlatTeamIds())
                 .workspaceIds(req.getWorkspaceIds())
                 .build();
         List<OrgNodeDTO> orgNodeDTOS = nodeService.list(nodeReq);