diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java
index 305b1ab..9b9801c 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java
@@ -8,6 +8,6 @@ import org.springframework.context.annotation.Configuration;
  * @date 2022/4/25 10:48
  */
 @Configuration
-@EnableFeignClients(basePackages = "cn.axzo.orgmanax.api.**.feign")
+@EnableFeignClients(basePackages = "cn.axzo.orgmanax.api.project.worker.feign")
 public class OrgmanaxApiConfig {
 }
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/feign/OrgUserApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/feign/OrgUserApi.java
index b2d0179..db783d6 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/feign/OrgUserApi.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/feign/OrgUserApi.java
@@ -43,6 +43,6 @@ public interface OrgUserApi {
      * @return 通用人员列表
      */
     @PostMapping(value = "/api/org-user/generic/page")
-    ApiResult<PageResp<PageOrgUserElementResp>> page(@RequestBody @Valid PageOrgUserReq req);
+    ApiResult<PageResp<PageOrgUserElementResp>> genericPage(@RequestBody @Valid PageOrgUserReq req);
 
 }
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectgroup/feign/OrgProjectGroupApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/group/feign/OrgProjectGroupApi.java
similarity index 86%
rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectgroup/feign/OrgProjectGroupApi.java
rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/group/feign/OrgProjectGroupApi.java
index 18c9c15..05d0da6 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectgroup/feign/OrgProjectGroupApi.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/group/feign/OrgProjectGroupApi.java
@@ -1,9 +1,9 @@
-package cn.axzo.orgmanax.api.projectgroup.feign;
+package cn.axzo.orgmanax.api.project.group.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.dto.projectgroup.req.*;
-import cn.axzo.orgmanax.dto.projectgroup.resp.*;
+import cn.axzo.orgmanax.dto.project.group.req.*;
+import cn.axzo.orgmanax.dto.project.group.resp.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,29 +78,6 @@ public interface OrgProjectGroupApi {
 //  @PostMapping("/api/project-group/group/list")
 //  ApiResult<List<ProjectTeamGroupListResp>> groupList(@RequestBody ProjectTeamGroupListReq req);
 
-  /**
-   * 未分组工人
-   *
-   * @param req req
-   * @author: wxf
-   * @date: 2022/11/30 11:40
-   * @return:
-   * REQ-1483
-   **/
-  @PostMapping("api/ungrouped/worker")
-  ApiResult<List<ProjectDirectGroupUngroupedWorkerResp>> ungroupedWorker(@RequestBody @Valid ProjectDirectGroupUngroupedWorkerReq req);
-
-  /**
-   * 直属小组工人
-   *
-   * @param req req
-   * @author: wxf
-   * @date: 2022/11/30 14:04
-   * @return:
-   **/
-  @PostMapping("api/direct-group/worker")
-  ApiResult<List<ProjectDirectGroupWorkerListResp>> workerList(@RequestBody @Valid ProjectDirectGroupWorkerListReq req);
-
   /**
    * 小组长权限
    *
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectworker/enums/ProjectWorkerStatusEnum.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/enums/ProjectWorkerStatusEnum.java
similarity index 95%
rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectworker/enums/ProjectWorkerStatusEnum.java
rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/enums/ProjectWorkerStatusEnum.java
index 070bb87..d0e1ccf 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/projectworker/enums/ProjectWorkerStatusEnum.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/enums/ProjectWorkerStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.projectworker.enums;
+package cn.axzo.orgmanax.api.project.worker.enums;
 
 import lombok.Getter;
 
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/feign/OrgProjectWorkerApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/feign/OrgProjectWorkerApi.java
new file mode 100644
index 0000000..6d953f2
--- /dev/null
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/worker/feign/OrgProjectWorkerApi.java
@@ -0,0 +1,45 @@
+package cn.axzo.orgmanax.api.project.worker.feign;
+
+import cn.axzo.foundation.result.ApiResult;
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupUngroupedWorkerReq;
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupWorkerListReq;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupUngroupedWorkerResp;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupWorkerListResp;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author zhanghongbo
+ * @date 2025/1/8
+ */
+@FeignClient(
+        value = "orgmanax",
+        url = "${axzo.service.orgmanax:http://orgmanax:8080}")
+public interface OrgProjectWorkerApi {
+    /**
+     * 未分组工人
+     *
+     * @param req req
+     * @author: wxf
+     * @date: 2022/11/30 11:40
+     * @return:
+     * REQ-1483
+     **/
+    @PostMapping("api/project-worker/ungrouped/worker")
+    ApiResult<List<ProjectDirectGroupUngroupedWorkerResp>> ungroupedWorker(@RequestBody @Valid ProjectDirectGroupUngroupedWorkerReq req);
+
+    /**
+     * 直属小组工人
+     *
+     * @param req req
+     * @author: wxf
+     * @date: 2022/11/30 14:04
+     * @return:
+     **/
+    @PostMapping("api/project-worker/direct-group/worker")
+    ApiResult<List<ProjectDirectGroupWorkerListResp>> workerList(@RequestBody @Valid ProjectDirectGroupWorkerListReq req);
+}
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java
index 955ac9a..4175e1d 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java
@@ -208,7 +208,7 @@ public class ListNodeUserReq extends PageReqV2 {
     private String keyword;
     /**
      * 状态：1未激活  2、已激活 3、施工中  4、已退场
-     * @see cn.axzo.orgmanax.api.projectworker.enums.ProjectWorkerStatusEnum
+     * @see cn.axzo.orgmanax.api.project.worker.enums.ProjectWorkerStatusEnum
      */
     private Collection<Integer> projectWorkerStatuses;
     /**
@@ -307,6 +307,8 @@ public class ListNodeUserReq extends PageReqV2 {
      */
     private DistinctRule distinctRule;
 
+    //
+
     // 指定聚合信息
     /**
      * 聚合信息needs
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/enums/ProjectGroupOwnerPermissionEnum.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/enums/ProjectGroupOwnerPermissionEnum.java
similarity index 96%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/enums/ProjectGroupOwnerPermissionEnum.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/enums/ProjectGroupOwnerPermissionEnum.java
index c3ccd2a..2a44816 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/enums/ProjectGroupOwnerPermissionEnum.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/enums/ProjectGroupOwnerPermissionEnum.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.enums;
+package cn.axzo.orgmanax.dto.project.group.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeCreateReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeCreateReq.java
similarity index 97%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeCreateReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeCreateReq.java
index f44604d..3eb823c 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeCreateReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeCreateReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeDeleteReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeDeleteReq.java
similarity index 91%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeDeleteReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeDeleteReq.java
index 2151d56..f64dea8 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeDeleteReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeDeleteReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeEditReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeEditReq.java
similarity index 94%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeEditReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeEditReq.java
index 6b929ed..4a65969 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/GroupNodeEditReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/GroupNodeEditReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/LeaderAndPermissionReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/LeaderAndPermissionReq.java
similarity index 92%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/LeaderAndPermissionReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/LeaderAndPermissionReq.java
index ab28e67..efc919c 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/LeaderAndPermissionReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/LeaderAndPermissionReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageGroupReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageGroupReq.java
similarity index 95%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageGroupReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageGroupReq.java
index b85aef1..24795b9 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageGroupReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageGroupReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageProjectGroupNodeReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageProjectGroupNodeReq.java
similarity index 91%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageProjectGroupNodeReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageProjectGroupNodeReq.java
index 7cc382a..fc98095 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupPageProjectGroupNodeReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupPageProjectGroupNodeReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupUngroupedWorkerReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupUngroupedWorkerReq.java
similarity index 89%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupUngroupedWorkerReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupUngroupedWorkerReq.java
index 2688d74..0b9cfe6 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupUngroupedWorkerReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupUngroupedWorkerReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupWorkerListReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupWorkerListReq.java
similarity index 93%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupWorkerListReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupWorkerListReq.java
index 6524b8a..0348964 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectDirectGroupWorkerListReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectDirectGroupWorkerListReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupPageReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupPageReq.java
similarity index 97%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupPageReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupPageReq.java
index 56edbf9..ade66fb 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupPageReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupPageReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupProfessionBaseReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupProfessionBaseReq.java
similarity index 98%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupProfessionBaseReq.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupProfessionBaseReq.java
index 05a7501..c8f8e29 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/req/ProjectGroupProfessionBaseReq.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/req/ProjectGroupProfessionBaseReq.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.req;
+package cn.axzo.orgmanax.dto.project.group.req;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ExposeGroupWorkerRespItem.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ExposeGroupWorkerRespItem.java
similarity index 91%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ExposeGroupWorkerRespItem.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ExposeGroupWorkerRespItem.java
index c6cfbdb..2c88a06 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ExposeGroupWorkerRespItem.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ExposeGroupWorkerRespItem.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LabourProjectGroupListV2Res.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LabourProjectGroupListV2Res.java
similarity index 97%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LabourProjectGroupListV2Res.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LabourProjectGroupListV2Res.java
index 7323405..f222591 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LabourProjectGroupListV2Res.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LabourProjectGroupListV2Res.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LeaderAndPermissionRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LeaderAndPermissionRes.java
similarity index 95%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LeaderAndPermissionRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LeaderAndPermissionRes.java
index 32016cb..373c87a 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/LeaderAndPermissionRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/LeaderAndPermissionRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/NoleaderProjectGroupWorkerRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/NoleaderProjectGroupWorkerRes.java
similarity index 95%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/NoleaderProjectGroupWorkerRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/NoleaderProjectGroupWorkerRes.java
index 85d875c..77cfc8f 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/NoleaderProjectGroupWorkerRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/NoleaderProjectGroupWorkerRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupUngroupedWorkerResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupUngroupedWorkerResp.java
similarity index 86%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupUngroupedWorkerResp.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupUngroupedWorkerResp.java
index 43edf38..8a0ca47 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupUngroupedWorkerResp.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupUngroupedWorkerResp.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupWorkerListResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupWorkerListResp.java
similarity index 79%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupWorkerListResp.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupWorkerListResp.java
index f961e88..1c5f1bd 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectDirectGroupWorkerListResp.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectDirectGroupWorkerListResp.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupAndWorkerResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupAndWorkerResp.java
similarity index 95%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupAndWorkerResp.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupAndWorkerResp.java
index a7b1791..8734ba7 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupAndWorkerResp.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupAndWorkerResp.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupListRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupListRes.java
similarity index 96%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupListRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupListRes.java
index 21c5bc7..fbd9bbe 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupListRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupListRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupNodeRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupNodeRes.java
similarity index 88%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupNodeRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupNodeRes.java
index 760612e..75c266c 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupNodeRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupNodeRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupOwnerPermissionRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupOwnerPermissionRes.java
similarity index 81%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupOwnerPermissionRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupOwnerPermissionRes.java
index bfd217e..2dd41b6 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupOwnerPermissionRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupOwnerPermissionRes.java
@@ -1,6 +1,6 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
-import cn.axzo.orgmanax.dto.projectgroup.enums.ProjectGroupOwnerPermissionEnum;
+import cn.axzo.orgmanax.dto.project.group.enums.ProjectGroupOwnerPermissionEnum;
 import lombok.Data;
 
 import java.util.List;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupRes.java
similarity index 96%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupRes.java
index 60b3620..0c13dba 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectGroupRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectGroupRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import cn.axzo.orgmanax.dto.project.team.dto.TeamCategoryAggregateDTO;
 import lombok.AllArgsConstructor;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectNodeWorkerResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectNodeWorkerResp.java
similarity index 94%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectNodeWorkerResp.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectNodeWorkerResp.java
index 6b0a740..f82d195 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectNodeWorkerResp.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectNodeWorkerResp.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectTeamGroupWorkerRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectTeamGroupWorkerRes.java
similarity index 89%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectTeamGroupWorkerRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectTeamGroupWorkerRes.java
index a28dfd8..a9c23f6 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectTeamGroupWorkerRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectTeamGroupWorkerRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerBaseInfo.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerBaseInfo.java
similarity index 95%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerBaseInfo.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerBaseInfo.java
index 2679fe2..2bc198d 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerBaseInfo.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerBaseInfo.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerProfessionRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerProfessionRes.java
similarity index 89%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerProfessionRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerProfessionRes.java
index 10d12df..fe47fa1 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerProfessionRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerProfessionRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerSkillTagRes.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerSkillTagRes.java
similarity index 91%
rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerSkillTagRes.java
rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerSkillTagRes.java
index f46f983..bcf76ad 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/projectgroup/resp/ProjectWorkerSkillTagRes.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/group/resp/ProjectWorkerSkillTagRes.java
@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.dto.projectgroup.resp;
+package cn.axzo.orgmanax.dto.project.group.resp;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java
index fa4cd1d..826cc0d 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java
@@ -269,11 +269,6 @@ public class NodeUserServiceImpl implements NodeUserService {
         return listReq;
     }
 
-    @Override
-    public List<SearchEntNodeUserResp> searchEntUser(SearchEntNodeUserReq req) {
-        return nodeUserFoundationService.searchEntUser(req);
-    }
-
     /**
      * 处理 findBy 查询。通过查询结果，再次查询的情况。如 findByTopNodeId 和 findByAncestorNodeId
      *
@@ -321,6 +316,11 @@ public class NodeUserServiceImpl implements NodeUserService {
         return nodeUserQueryRepository.page(findByReq);
     }
 
+    @Override
+    public List<SearchEntNodeUserResp> searchEntUser(SearchEntNodeUserReq req) {
+        return nodeUserFoundationService.searchEntUser(req);
+    }
+
     private void assemble(ListNodeUserReq req, List<NodeUserDTO> records) {
         assembleUnit(req, records);
         assembleJob(req, records);
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/controller/OrgUserController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/controller/OrgUserController.java
index 9b01a4e..633bf88 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/controller/OrgUserController.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/controller/OrgUserController.java
@@ -29,7 +29,7 @@ public class OrgUserController implements OrgUserApi {
     }
 
     @Override
-    public ApiResult<PageResp<PageOrgUserElementResp>> page(PageOrgUserReq req) {
+    public ApiResult<PageResp<PageOrgUserElementResp>> genericPage(PageOrgUserReq req) {
         return ApiResult.success();
     }
 }
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/controller/OrgProjectWorkerController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/controller/OrgProjectWorkerController.java
new file mode 100644
index 0000000..ffe4c1c
--- /dev/null
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/controller/OrgProjectWorkerController.java
@@ -0,0 +1,38 @@
+package cn.axzo.orgmanax.server.projectworker.controller;
+
+import cn.axzo.foundation.result.ApiResult;
+import cn.axzo.orgmanax.api.project.worker.feign.OrgProjectWorkerApi;
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupUngroupedWorkerReq;
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupWorkerListReq;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupUngroupedWorkerResp;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupWorkerListResp;
+import cn.axzo.orgmanax.server.projectworker.service.OrgProjectWorkerService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author zhanghongbo
+ * @date 2025/1/8
+ */
+@RestController
+@Slf4j
+@AllArgsConstructor
+public class OrgProjectWorkerController implements OrgProjectWorkerApi {
+
+    private OrgProjectWorkerService orgProjectWorkerService;
+
+    @Override
+    public ApiResult<List<ProjectDirectGroupUngroupedWorkerResp>> ungroupedWorker(@Valid ProjectDirectGroupUngroupedWorkerReq req) {
+        orgProjectWorkerService.ungroupedWorker(req);
+        return null;
+    }
+
+    @Override
+    public ApiResult<List<ProjectDirectGroupWorkerListResp>> workerList(@Valid ProjectDirectGroupWorkerListReq req) {
+        return null;
+    }
+}
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/OrgProjectWorkerService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/OrgProjectWorkerService.java
new file mode 100644
index 0000000..1b95648
--- /dev/null
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/OrgProjectWorkerService.java
@@ -0,0 +1,14 @@
+package cn.axzo.orgmanax.server.projectworker.service;
+
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupUngroupedWorkerReq;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupUngroupedWorkerResp;
+
+import java.util.List;
+
+/**
+ * @author zhanghongbo
+ * @date 2025/1/8
+ */
+public interface OrgProjectWorkerService {
+    List<ProjectDirectGroupUngroupedWorkerResp> ungroupedWorker(ProjectDirectGroupUngroupedWorkerReq req);
+}
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/impl/OrgProjectWorkerServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/impl/OrgProjectWorkerServiceImpl.java
new file mode 100644
index 0000000..05e79f1
--- /dev/null
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/projectworker/service/impl/OrgProjectWorkerServiceImpl.java
@@ -0,0 +1,68 @@
+package cn.axzo.orgmanax.server.projectworker.service.impl;
+
+import cn.axzo.orgmanax.api.project.worker.enums.ProjectWorkerStatusEnum;
+import cn.axzo.orgmanax.dto.common.IdentityType;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.project.group.req.ProjectDirectGroupUngroupedWorkerReq;
+import cn.axzo.orgmanax.dto.project.group.resp.ProjectDirectGroupUngroupedWorkerResp;
+import cn.axzo.orgmanax.server.node.service.NodeService;
+import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService;
+import cn.axzo.orgmanax.server.projectworker.service.OrgProjectWorkerService;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhanghongbo
+ * @date 2025/1/8
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+public class OrgProjectWorkerServiceImpl implements OrgProjectWorkerService {
+
+    private NodeUserService nodeUserService;
+    private NodeService nodeService;
+
+    @Override
+    public List<ProjectDirectGroupUngroupedWorkerResp> ungroupedWorker(ProjectDirectGroupUngroupedWorkerReq req) {
+//        //查询班组下工人
+//        List<NodeUserDTO> nodeUserDTOS4Team = nodeUserService.list(ListNodeUserReq.builder()
+//                .workspaceId(req.getWorkspaceId())
+//                .platTeamId(req.getPlatTeamId())
+//                .identityType(IdentityType.WORKER.getCode())
+//                .projectWorkerStatuses(Lists.newArrayList(ProjectWorkerStatusEnum.INACTIVE.getValue(), ProjectWorkerStatusEnum.ACTIVE.getValue()))
+//                .build());
+//        if (ObjectUtil.isEmpty(nodeUserDTOS4Team)) {
+//            return Collections.emptyList();
+//        }
+//
+//        //查询班组下的直属小组工人
+//        nodeService.list(ListNodeReq.builder()
+//                .platTeamIds(Sets.newHashSet(req.getPlatTeamId()))
+//                .workspaceIds(Sets.newHashSet(req.getWorkspaceId()))
+//                .groupType(ProjectGroupTypeEnum.DIRECTLY_UNDER.getValue())
+//                .build());
+//
+//
+//        List<NodeUserDTO> nodeUserDTOS = nodeUserService.list(ListNodeUserReq.builder()
+//                .workspaceId(req.getWorkspaceId())
+//                .platTeamId(req.getPlatTeamId())
+//                .projectWorkerStatuses(Lists.newArrayList(ProjectWorkerStatusEnum.INACTIVE.getValue(), ProjectWorkerStatusEnum.ACTIVE.getValue()))
+//                .build());
+
+
+
+
+        return null;
+    }
+}
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/service/impl/OrgProjectWorkerProfessionServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/service/impl/OrgProjectWorkerProfessionServiceImpl.java
index c4986d7..f12ee7f 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/service/impl/OrgProjectWorkerProfessionServiceImpl.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/service/impl/OrgProjectWorkerProfessionServiceImpl.java
@@ -1,11 +1,8 @@
 package cn.axzo.orgmanax.server.workerprofession.service.impl;
 import cn.axzo.orgmanax.dto.workerprofession.dto.ProjectWorkerProfessionDTO;
-import com.google.common.collect.Maps;
 
-import cn.axzo.foundation.dao.support.mysql.MybatisPlusOperatorProcessor;
-import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.projectworker.enums.ProjectWorkerStatusEnum;
+import cn.axzo.orgmanax.api.project.worker.enums.ProjectWorkerStatusEnum;
 import cn.axzo.orgmanax.dto.common.IdentityType;
 import cn.axzo.orgmanax.dto.common.util.NumberUtil;
 import cn.axzo.orgmanax.dto.common.util.TreeUtil;