feat(REQ-3282): 调整NodeUserQueryRepository的职责，不做聚合，聚合和查询参数转化放到service层

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java

@@ -1,13 +1,10 @@
 package cn.axzo.orgmanax.dto.nodeuser.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
-import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.PageReqV2;
-import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.dto.common.DistinctRule;
 import cn.axzo.orgmanax.dto.common.IdentityPair;
-import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
+import cn.axzo.orgmanax.dto.common.WorkspaceOuPair;
-import com.google.common.collect.ImmutableList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,103 +22,76 @@ import java.util.List;
 @SuperBuilder
 public class ListNodeUserReq extends PageReqV2 {
 
-    @CriteriaField
     private Long id;
-    @CriteriaField(field = "id", operator = Operator.GT)
     private Long idGt;
-    @CriteriaField(field = "id", operator = Operator.IN)
     private Collection<Long> ids;
 
     /**
      * identity_id
      */
-    @CriteriaField
     private Long identityId;
-    @CriteriaField(field = "identityId", operator = Operator.IN)
     private Collection<Long> identityIds;
 
     /**
      * 身份类型 0-无效类型, 1-工人, 2-班组长, 3-从业人员, 4-政务人员，5-运营人员
      */
-    @CriteriaField
     private Integer identityType;
-    @CriteriaField(field = "identityType", operator = Operator.IN)
     private Collection<Integer> identityTypes;
 
     /**
      * 自然人id
      */
-    @CriteriaField
     private Long personId;
-    @CriteriaField(field = "personId", operator = Operator.IN)
     private Collection<Long> personIds;
-    @CriteriaField(field = "personId", operator = Operator.NOT_IN)
     private Collection<Long> excludePersonIds;
 
     /**
      * 主电话
      */
-    @CriteriaField
     private String phone;
-    @CriteriaField(field = "phone", operator = Operator.NOT_IN)
     private Collection<String> phones;
 
     /**
      * 名字
      */
-    @CriteriaField
     private String realName;
-    @CriteriaField(field = "realName", operator = Operator.LIKE)
     private String realNameLike;
 
     /**
      * 身份证号
      */
-    @CriteriaField
     private String idNumber;
-    @CriteriaField(field = "idNumber", operator = Operator.IN)
     private Collection<String> idNumbers;
 
     /**
      * 单位id
      */
-    @CriteriaField
     private Long organizationalUnitId;
-    @CriteriaField(field = "organizationalUnitId", operator = Operator.IN)
     private Collection<Long> organizationalUnitIds;
 
     /**
      * 组织节点id
      */
-    @CriteriaField
     private Long organizationalNodeId;
-    @CriteriaField(field = "organizationalNodeId", operator = Operator.IN)
     private Collection<Long> organizationalNodeIds;
-    @CriteriaField(field = "organizationalNodeId", operator = Operator.NOT_IN)
     private Collection<Long> excludeOrganizationalNodeIds;
 
     /**
      * 顶级节点id
      */
-    @CriteriaField
     private Long topNodeId;
-    @CriteriaField(field = "topNodeId", operator = Operator.IN)
     private Collection<Long> topNodeIds;
-    @CriteriaField(field = "topNodeId", operator = Operator.GT)
     private Long topNodeIdGt;
 
     /**
      * 部门管理员 1是 0否
      */
-    @CriteriaField
     private Boolean manager;
 
     /**
      * 岗位id
      */
-    @CriteriaField
     private Long organizationalJobId;
-    @CriteriaField(field = "organizationalJobId", operator = Operator.IN)
     private Collection<Long> organizationalJobIds;
 
     /**
@@ -129,7 +99,6 @@ public class ListNodeUserReq extends PageReqV2 {
      */
     @CriteriaField
     private Long workspaceId;
-    @CriteriaField(field = "workspaceId", operator = Operator.IN)
     private Collection<Long> workspaceIds;
 
     /**
@@ -155,7 +124,6 @@ public class ListNodeUserReq extends PageReqV2 {
      */
     @CriteriaField
     private Long syncDataId;
-    @CriteriaField(field = "syncDataId", operator = Operator.IN)
     private List<Long> syncDataIds;
 
     /**
@@ -170,83 +138,83 @@ public class ListNodeUserReq extends PageReqV2 {
     /**
      * 入职时间，大于等于
      */
-    @CriteriaField(field = "joinAt", operator = Operator.GE)
     private Date joinAtGe;
 
     /**
      * 入职时间，小于等于
      */
-    @CriteriaField(field = "joinAt", operator = Operator.LE)
     private Date joinAtLe;
     /**
      * 离职时间，大于等于
      */
-    @CriteriaField(field = "leaveAt", operator = Operator.GE)
     private Date leaveAtGe;
     /**
      * 离职时间，小于等于
      */
-    @CriteriaField(field = "leaveAt", operator = Operator.LE)
     private Date leaveAtLe;
     /**
      * 更新时间，大于等于
      */
-    @CriteriaField(field = "updateAt", operator = Operator.GE)
     private Date updateAtGe;
     /**
      * 更新时间，小于等于
      */
-    @CriteriaField(field = "updateAt", operator = Operator.LE)
     private Date updateAtLe;
 
 
     // ~ 需特殊实现的查询字段。（非CriteriaField直接可查询的字段）
-
+    private Collection<WorkspaceOuPair> workspaceOuPairs;
     /**
      * leaderPersonId. 根据personId=leaderPersonId and manager = true，查询node。然后查询整个node下面的人
      */
-    @CriteriaField(ignore = true) // TODO: 待实现
     private Long leaderPersonId;
     /**
      * 下属personId，根据personId=subordinatePersonId，查询到node，然后返回node的manager。
      */
-    @CriteriaField(ignore = true)
     private Long subordinatePersonId; // TODO: 待实现
     // 岗位code
-    @CriteriaField(ignore = true)
     private String organizationalJobCode; // TODO: 待实现
 
-    @CriteriaField(ignore = true)
     private Collection<String> organizationalJobCodes; // TODO: 待实现
-    @CriteriaField(ignore = true)
     private String organizationalJobName; // TODO: 待实现
-    @CriteriaField(ignore = true)
     private String organizationalJobNameLike; // TODO: 待实现
-    @CriteriaField(ignore = true)
     private Boolean onlyHasJob; // TODO: 待实现
 
-    @CriteriaField(ignore = true)
     private Collection<IdentityPair> identityPairs; // TODO: 待实现
 
     /**
      * 查询返回数据包含，逻辑删除数据，即查询未删除和已删除的数据。
      */
-    @CriteriaField(ignore = true)
     private Boolean includeDeleted; // TODO: 待实现
     /**
      * 仅查询已删除的数据
      */
-    @CriteriaField(ignore = true)
     private Boolean deletedOnly; // TODO: 待实现
 
-    @CriteriaField(ignore = true)
     private Integer nodeState; // TODO: 待实现
 
     /**
      * keyword。用 idNumber，phone，jobNumber精确匹配，或者realName模糊匹配
      */
-    @CriteriaField(ignore = true)
     private String keyword;
+    /**
+     * 状态：1未激活  2、已激活 3、施工中  4、已退场
+     */
+    private Collection<Integer> projectWorkerStatuses; // TODO: 待实现
+
+    /**
+     * orgUserStatus
+     */
+    private Collection<String> orgUserStatus; // TODO: 待实现
+
+    // ~ 不同部门类型的nodeUser的差异化查询字段。如 项目内工人 的 项目班组id，平台班组id等。 start
+    private Long platTeamId; // TODO: 待实现
+    private Long projectTeamId; // TODO: 待实现
+    private Collection<Long> projectTeamIds; // TODO: 待实现
+    private Long projectWorkerId; // TODO: 待实现
+    private Long projectGroupId; // TODO: 待实现
+
+    // ~ 结束。
 
     // ~ 后置过滤的字段
     /**
@@ -276,22 +244,6 @@ public class ListNodeUserReq extends PageReqV2 {
      * 数据权限
      */
     private String dataPermissionCacheKey; // TODO: 待实现
-
-    /**
-     * orgUserStatus
-     */
-    private Collection<String> orgUserStatus; // TODO: 待实现
-
-    // ~ 不同部门类型的nodeUser的差异化查询字段。如 项目内工人 的 项目班组id，平台班组id等。 start
-    private Long platTeamId; // TODO: 待实现
-    private Long projectTeamId; // TODO: 待实现
-    private Collection<Long> projectTeamIds; // TODO: 待实现
-    private Long projectWorkerId; // TODO: 待实现
-    private Long projectGroupId; // TODO: 待实现
-    /**
-     * 状态：1未激活  2、已激活 3、施工中  4、已退场
-     */
-    private Collection<Integer> projectWorkerStatuses; // TODO: 待实现
     // ~ 不同部门类型的nodeUser的差异化查询字段。如 项目内工人 的 项目班组id，平台班组id等。 end
 
     /**
@@ -310,10 +262,8 @@ public class ListNodeUserReq extends PageReqV2 {
     /**
      * 聚合信息needs
      */
-    @CriteriaField(ignore = true)
     private Needs needs;
 
-
     @NoArgsConstructor
     @AllArgsConstructor
     @Data

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/repository/NodeUserQueryRepository.java

@@ -1,26 +1,33 @@
 package cn.axzo.orgmanax.infra.dao.nodeuser.repository;
 
+import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
+import cn.axzo.foundation.dao.support.wrapper.Operator;
+import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.common.IdentityPair;
-import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
+import cn.axzo.orgmanax.dto.common.WorkspaceOuPair;
 import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser;
-import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository;
-import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.base.Preconditions;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
 public interface NodeUserQueryRepository {
 
-    PageResp<NodeUserResp> page(ListNodeUserReq req);
+    PageResp<NodeUserResp> page(ListReq req);
 
-    default List<NodeUserResp> list(ListNodeUserReq req) {
+    default List<NodeUserResp> list(ListReq req) {
         return page(req).getData();
     }
 
@@ -30,12 +37,249 @@ public interface NodeUserQueryRepository {
 
     default Optional<NodeUserResp> oneOpt(OneReq req) {
         req.check();
-        ListNodeUserReq page = BeanUtil.toBean(req, ListNodeUserReq.class);
+        ListReq page = BeanUtil.toBean(req, ListReq.class);
         page.setPage(1);
         page.setPageSize(1);
         return page(page).getData().stream().findFirst();
     }
 
+    @EqualsAndHashCode(callSuper = true)
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Data
+    @Builder
+    class ListReq extends PageReqV2 {
+        @CriteriaField
+        private Long id;
+        @CriteriaField(field = "id", operator = Operator.GT)
+        private Long idGt;
+        @CriteriaField(field = "id", operator = Operator.IN)
+        private Collection<Long> ids;
+
+        /**
+         * identity_id
+         */
+        @CriteriaField
+        private Long identityId;
+        @CriteriaField(field = "identityId", operator = Operator.IN)
+        private Collection<Long> identityIds;
+
+        /**
+         * 身份类型 0-无效类型, 1-工人, 2-班组长, 3-从业人员, 4-政务人员，5-运营人员
+         */
+        @CriteriaField
+        private Integer identityType;
+        @CriteriaField(field = "identityType", operator = Operator.IN)
+        private Collection<Integer> identityTypes;
+
+        /**
+         * 自然人id
+         */
+        @CriteriaField
+        private Long personId;
+        @CriteriaField(field = "personId", operator = Operator.IN)
+        private Collection<Long> personIds;
+        @CriteriaField(field = "personId", operator = Operator.NOT_IN)
+        private Collection<Long> excludePersonIds;
+
+        /**
+         * 主电话
+         */
+        @CriteriaField
+        private String phone;
+        @CriteriaField(field = "phone", operator = Operator.NOT_IN)
+        private Collection<String> phones;
+
+        /**
+         * 名字
+         */
+        @CriteriaField
+        private String realName;
+        @CriteriaField(field = "realName", operator = Operator.LIKE)
+        private String realNameLike;
+
+        /**
+         * 身份证号
+         */
+        @CriteriaField
+        private String idNumber;
+        @CriteriaField(field = "idNumber", operator = Operator.IN)
+        private Collection<String> idNumbers;
+
+        /**
+         * 单位id
+         */
+        @CriteriaField
+        private Long organizationalUnitId;
+        @CriteriaField(field = "organizationalUnitId", operator = Operator.IN)
+        private Collection<Long> organizationalUnitIds;
+
+        /**
+         * 组织节点id
+         */
+        @CriteriaField
+        private Long organizationalNodeId;
+        @CriteriaField(field = "organizationalNodeId", operator = Operator.IN)
+        private Collection<Long> organizationalNodeIds;
+        @CriteriaField(field = "organizationalNodeId", operator = Operator.NOT_IN)
+        private Collection<Long> excludeOrganizationalNodeIds;
+
+        /**
+         * 顶级节点id
+         */
+        @CriteriaField
+        private Long topNodeId;
+        @CriteriaField(field = "topNodeId", operator = Operator.IN)
+        private Collection<Long> topNodeIds;
+        @CriteriaField(field = "topNodeId", operator = Operator.GT)
+        private Long topNodeIdGt;
+
+        /**
+         * 部门管理员 1是 0否
+         */
+        @CriteriaField
+        private Boolean manager;
+
+        /**
+         * 岗位id
+         */
+        @CriteriaField
+        private Long organizationalJobId;
+        @CriteriaField(field = "organizationalJobId", operator = Operator.IN)
+        private Collection<Long> organizationalJobIds;
+
+        /**
+         * 工作台ID
+         */
+        @CriteriaField
+        private Long workspaceId;
+        @CriteriaField(field = "workspaceId", operator = Operator.IN)
+        private Collection<Long> workspaceIds;
+
+        /**
+         * 0:普通岗位、1:主岗位
+         */
+        @CriteriaField
+        private Integer primaryJob;
+
+        /**
+         * 是否允许进入工地 1.允许 2.不允许
+         */
+        @CriteriaField
+        private Integer isAllowed;
+
+        /**
+         * 迁移数据临时源id
+         */
+        @CriteriaField
+        private Long tempSourceId;
+
+        /**
+         * 数据同步ID
+         */
+        @CriteriaField
+        private Long syncDataId;
+        @CriteriaField(field = "syncDataId", operator = Operator.IN)
+        private List<Long> syncDataIds;
+
+        /**
+         * 工号
+         */
+        @CriteriaField
+        private String jobNumber;
+
+        @CriteriaField
+        private Integer activeFlag;
+
+        /**
+         * 入职时间，大于等于
+         */
+        @CriteriaField(field = "joinAt", operator = Operator.GE)
+        private Date joinAtGe;
+
+        /**
+         * 入职时间，小于等于
+         */
+        @CriteriaField(field = "joinAt", operator = Operator.LE)
+        private Date joinAtLe;
+        /**
+         * 离职时间，大于等于
+         */
+        @CriteriaField(field = "leaveAt", operator = Operator.GE)
+        private Date leaveAtGe;
+        /**
+         * 离职时间，小于等于
+         */
+        @CriteriaField(field = "leaveAt", operator = Operator.LE)
+        private Date leaveAtLe;
+        /**
+         * 更新时间，大于等于
+         */
+        @CriteriaField(field = "updateAt", operator = Operator.GE)
+        private Date updateAtGe;
+        /**
+         * 更新时间，小于等于
+         */
+        @CriteriaField(field = "updateAt", operator = Operator.LE)
+        private Date updateAtLe;
+
+
+        // ~ 需特殊实现的查询字段。（非CriteriaField直接可查询的字段）
+        @CriteriaField(ignore = true)
+        private Collection<WorkspaceOuPair> workspaceOuPairs;
+        /**
+         * leaderPersonId. 根据personId=leaderPersonId and manager = true，查询node。然后查询整个node下面的人
+         */
+        @CriteriaField(ignore = true) // TODO: 待实现
+        private Long leaderPersonId;
+        /**
+         * 下属personId，根据personId=subordinatePersonId，查询到node，然后返回node的manager。
+         */
+        @CriteriaField(ignore = true)
+        private Long subordinatePersonId; // TODO: 待实现
+        // 岗位code
+        @CriteriaField(ignore = true)
+        private String organizationalJobCode; // TODO: 待实现
+
+        @CriteriaField(ignore = true)
+        private Collection<String> organizationalJobCodes; // TODO: 待实现
+        @CriteriaField(ignore = true)
+        private String organizationalJobName; // TODO: 待实现
+        @CriteriaField(ignore = true)
+        private String organizationalJobNameLike; // TODO: 待实现
+        @CriteriaField(ignore = true)
+        private Boolean onlyHasJob; // TODO: 待实现
+
+        @CriteriaField(ignore = true)
+        private Collection<IdentityPair> identityPairs; // TODO: 待实现
+
+        /**
+         * 查询返回数据包含，逻辑删除数据，即查询未删除和已删除的数据。
+         */
+        @CriteriaField(ignore = true)
+        private Boolean includeDeleted; // TODO: 待实现
+        /**
+         * 仅查询已删除的数据
+         */
+        @CriteriaField(ignore = true)
+        private Boolean deletedOnly; // TODO: 待实现
+
+        @CriteriaField(ignore = true)
+        private Integer nodeState; // TODO: 待实现
+
+        /**
+         * keyword。用 idNumber，phone，jobNumber精确匹配，或者realName模糊匹配
+         */
+        @CriteriaField(ignore = true)
+        private String keyword;
+
+        /**
+         * orgUserStatus
+         */
+        @CriteriaField(ignore = true)
+        private Collection<String> orgUserStatus; // TODO: 待实现
+    }
+
     @NoArgsConstructor
     @AllArgsConstructor
     @Data
@@ -55,26 +299,7 @@ public interface NodeUserQueryRepository {
     @Data
     @SuperBuilder
     class NodeUserResp extends OrganizationalNodeUser {
-        /**
+        private String xx;
-         * 查询参数指定 needs.node = true，才会返回
-         *
-         * @see ListNodeUserReq.Needs#getNode()
-         */
-        private NodeQueryRepository.NodeResp node;
-
-        /**
-         * 查询参数指定 needs.unit = true，才会返回
-         *
-         * @see ListNodeUserReq.Needs#getUnit()
-         */
-        private UnitQueryRepository.UnitResp unit;
-
-        /**
-         * 查询参数指定 needs.job = true，才会返回
-         *
-         * @see ListNodeUserReq.Needs#getJob()
-         */
-        private OrgJobQueryRepository.JobResp job;
     }
 
 }

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/repository/impl/NodeUserQueryRepositoryImpl.java

@@ -3,14 +3,9 @@ package cn.axzo.orgmanax.infra.dao.nodeuser.repository.impl;
 import cn.axzo.foundation.dao.support.converter.PageConverter;
 import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
-import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
 import cn.axzo.orgmanax.infra.dao.nodeuser.dao.NodeUserDao;
 import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser;
 import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
-import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob;
-import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository;
-import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.BooleanUtil;
@@ -20,14 +15,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.ImmutableList;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -35,12 +25,9 @@ import java.util.stream.Collectors;
 public class NodeUserQueryRepositoryImpl implements NodeUserQueryRepository {
 
     private final NodeUserDao nodeUserDao;
-    private final NodeQueryRepository nodeQueryRepository;
-    private final OrgJobQueryRepository jobQueryRepository;
-    private final UnitQueryRepository unitQueryRepository;
 
     @Override
-    public PageResp<NodeUserResp> page(ListNodeUserReq req) {
+    public PageResp<NodeUserResp> page(ListReq req) {
         IPage<OrganizationalNodeUser> page = PageConverter.toMybatis(req, OrganizationalNodeUser.class);
         PageResp<NodeUserResp> emptyPage = PageResp.<NodeUserResp>builder().size(req.getPageSize()).current(req.getPage()).total(0L).data(ImmutableList.of()).build();
         QueryWrapper<OrganizationalNodeUser> wrapper = QueryWrapperHelper.fromBean(req, OrganizationalNodeUser.class);
@@ -61,91 +48,17 @@ public class NodeUserQueryRepositoryImpl implements NodeUserQueryRepository {
         if (!BooleanUtil.isTrue(req.getIncludeDeleted())) {
             wrapper.eq("is_delete", 0);
         }
-        // jobIds查询 - 这里可以合并对orgJob的查询。后续优化。
-        if (CollUtil.isNotEmpty(req.getOrganizationalJobCodes())) {
-            Set<Long> jobIds = jobQueryRepository.list(OrgJobQueryRepository.ListReq.builder().codes(req.getOrganizationalJobCodes()).build())
-                    .stream().map(OrgJob::getId).collect(Collectors.toSet());
-            if (jobIds.isEmpty()) {
-                return emptyPage;
-            }
-            wrapper.in("organizational_job_id", jobIds);
-        }
-        if (StrUtil.isNotBlank(req.getOrganizationalJobCode())) {
-            Set<Long> jobIds = jobQueryRepository.list(OrgJobQueryRepository.ListReq.builder().codes(req.getOrganizationalJobCodes()).build())
-                    .stream().map(OrgJob::getId).collect(Collectors.toSet());
-            if (jobIds.isEmpty()) {
-                return emptyPage;
-            }
-            wrapper.eq("organizational_job_id", jobIds);
-        }
-        if (StringUtils.isNotBlank(req.getOrganizationalJobNameLike())) {
-            Set<Long> jobIds = jobQueryRepository.list(OrgJobQueryRepository.ListReq.builder().nameLike(req.getOrganizationalJobNameLike()).build())
-                    .stream().map(OrgJob::getId).collect(Collectors.toSet());
-            if (jobIds.isEmpty()) {
-                return emptyPage;
-            }
-            wrapper.in("organizational_job_id", jobIds);
-        }
-
         IPage<NodeUserResp> results = nodeUserDao.page(page, wrapper)
                 .convert(e -> BeanUtil.toBean(e, NodeUserResp.class));
-        PageResp<NodeUserResp> resp = PageConverter.toResp(results);
+        if (CollUtil.isEmpty(results.getRecords())) {
+            return emptyPage;
+        }
+        PageResp resp = PageConverter.toResp(results);
         List<NodeUserResp> records = resp.getData();
         if (CollUtil.isEmpty(records)) {
             return resp;
         }
-
-        // assembles
-        assembleNode(req, records);
-        assembleJob(req, records);
-        assembleUnit(req, records);
         return resp;
     }
 
-    private void assembleUnit(ListNodeUserReq req, List<NodeUserResp> records) {
-        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
-            return;
-        }
-        if (!BooleanUtil.isTrue(req.getNeeds().getUnit())) {
-            return;
-        }
-        Set<Long> unitIds = records.stream().map(NodeUserResp::getOrganizationalUnitId).collect(Collectors.toSet());
-        Map<Long, UnitQueryRepository.UnitResp> unitsById = unitQueryRepository.list(UnitQueryRepository.ListReq.builder()
-                .ids(unitIds)
-                .build()).stream().collect(Collectors.toMap(UnitQueryRepository.UnitResp::getId, Function.identity()));
-        records.forEach(r -> r.setUnit(unitsById.get(r.getOrganizationalUnitId())));
-    }
-
-    private void assembleJob(ListNodeUserReq req, List<NodeUserResp> records) {
-        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
-            return;
-        }
-        if (!BooleanUtil.isTrue(req.getNeeds().getJob())) {
-            return;
-        }
-        Set<Long> jobIds = records.stream().map(NodeUserResp::getOrganizationalJobId).collect(Collectors.toSet());
-        // assemble job
-        Map<Long, OrgJobQueryRepository.JobResp> jobsById = jobQueryRepository.page(OrgJobQueryRepository.ListReq.builder()
-                .ids(jobIds)
-                .build()).getData().stream().collect(Collectors.toMap(OrgJobQueryRepository.JobResp::getId, Function.identity()));
-        records.forEach(r -> r.setJob(jobsById.get(r.getOrganizationalJobId())));
-    }
-
-    private void assembleNode(ListNodeUserReq req, List<NodeUserResp> records) {
-        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
-            return;
-        }
-        if (!BooleanUtil.isTrue(req.getNeeds().getNode()) && !BooleanUtil.isTrue(req.getNeeds().getAncestorNode())) {
-            return;
-        }
-        Set<Long> nodeIds = records.stream().map(NodeUserResp::getOrganizationalNodeId).collect(Collectors.toSet());
-        // assemble parentNode
-        Map<Long, NodeQueryRepository.NodeResp> nodesById = nodeQueryRepository.list(NodeQueryRepository.ListReq.builder()
-                .ids(nodeIds)
-                .needAncestorNode(BooleanUtil.isTrue(req.getNeeds().getAncestorNode()))
-                .build()).stream().collect(Collectors.toMap(NodeQueryRepository.NodeResp::getId, Function.identity()));
-
-        records.forEach(r -> r.setNode(nodesById.get(r.getOrganizationalNodeId())));
-    }
-
 }

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java

@@ -62,6 +62,8 @@ public interface OrgJobQueryRepository {
 
         @CriteriaField(field = "code", operator = Operator.IN)
         private Collection<String> codes;
+        @CriteriaField
+        private String code;
 
         /**
          * 岗位类型

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java

@@ -2,21 +2,38 @@ package cn.axzo.orgmanax.server.nodeuser.service.impl;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
+import cn.axzo.orgmanax.common.config.BizResultCode;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
+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.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
-import cn.axzo.orgmanax.common.config.BizResultCode;
+import cn.axzo.orgmanax.dto.unit.req.ListUnitReq;
 import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
+import cn.axzo.orgmanax.server.node.service.NodeService;
 import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService;
 import cn.axzo.orgmanax.server.nodeuser.service.processor.NodeUserProcessor;
+import cn.axzo.orgmanax.server.orgjob.service.OrgJobService;
+import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam;
+import cn.axzo.orgmanax.server.unit.service.UnitService;
+import cn.axzo.orgmanax.server.util.QueryConditionAssembler;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.google.common.collect.ImmutableList;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -24,6 +41,9 @@ import java.util.List;
 public class NodeUserServiceImpl implements NodeUserService {
 
     private final NodeUserQueryRepository nodeUserQueryRepository;
+    private final NodeService nodeService;
+    private final OrgJobService jobService;
+    private final UnitService unitService;
     private final ApplicationContext applicationContext;
 
     @Override
@@ -50,9 +70,80 @@ public class NodeUserServiceImpl implements NodeUserService {
 
     @Override
     public PageResp<NodeUserDTO> page(ListNodeUserReq req) {
-        PageResp<NodeUserQueryRepository.NodeUserResp> page = nodeUserQueryRepository.page(req);
+        PageResp<NodeUserDTO> emptyPage = PageResp.<NodeUserDTO>builder().size(req.getPageSize())
+                .current(req.getPage()).total(0L).data(ImmutableList.of()).build();
+        NodeUserQueryRepository.ListReq listReq = BeanUtil.toBean(req, NodeUserQueryRepository.ListReq.class);
+        // jobCodes -> jobIds
+        if (CollUtil.isNotEmpty(req.getOrganizationalJobCodes())
+                || StrUtil.isNotBlank(req.getOrganizationalJobCode())
+                || StrUtil.isNotBlank(req.getOrganizationalJobNameLike())) {
+            Set<Long> jobIds = jobService.page(OrgJobPageParam.builder()
+                            .jobCodes(req.getOrganizationalJobCodes())
+                            .jobCode(req.getOrganizationalJobCode())
+                            .jobNameLike(req.getOrganizationalJobNameLike())
+                            .build())
+                    .getData().stream().map(OrgJobDTO::getId).collect(Collectors.toSet());
+            if (jobIds.isEmpty()) {
+                return emptyPage;
+            }
+            req.setOrganizationalJobIds(QueryConditionAssembler.assemble(req.getOrganizationalJobIds(), jobIds));
+        }
+        PageResp<NodeUserQueryRepository.NodeUserResp> page = nodeUserQueryRepository.page(listReq);
         List<NodeUserDTO> records = BeanUtil.copyToList(CollUtil.emptyIfNull(page.getData()), NodeUserDTO.class);
+
         // assemble data if needed
+        assembleUnit(req, records);
+        assembleJob(req, records);
+        assembleNode(req, records);
         return new PageResp<>(page.getTotal(), page.getSize(), page.getCurrent(), records);
     }
+
+
+    private void assembleUnit(ListNodeUserReq req, List<NodeUserDTO> records) {
+        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
+            return;
+        }
+        if (!BooleanUtil.isTrue(req.getNeeds().getUnit())) {
+            return;
+        }
+        Set<Long> unitIds = records.stream().map(NodeUserDTO::getOrganizationalUnitId).collect(Collectors.toSet());
+        Map<Long, OrgUnitDTO> unitsById = unitService.list(ListUnitReq.builder()
+                .ids(unitIds)
+                .searchCount(false)
+                .build()).getData().stream().collect(Collectors.toMap(OrgUnitDTO::getId, Function.identity()));
+        records.forEach(r -> r.setUnit(unitsById.get(r.getOrganizationalUnitId())));
+    }
+
+    private void assembleJob(ListNodeUserReq req, List<NodeUserDTO> records) {
+        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
+            return;
+        }
+        if (!BooleanUtil.isTrue(req.getNeeds().getJob())) {
+            return;
+        }
+        Set<Long> jobIds = records.stream().map(NodeUserDTO::getOrganizationalJobId).collect(Collectors.toSet());
+        // assemble job
+        Map<Long, OrgJobDTO> jobsById = jobService.page(OrgJobPageParam.builder()
+                .jobIds(jobIds)
+                .build()).getData().stream().collect(Collectors.toMap(OrgJobDTO::getId, Function.identity()));
+        records.forEach(r -> r.setJob(jobsById.get(r.getOrganizationalJobId())));
+    }
+
+    private void assembleNode(ListNodeUserReq req, List<NodeUserDTO> records) {
+        if (CollUtil.isEmpty(records) || req.getNeeds() == null) {
+            return;
+        }
+        if (!BooleanUtil.isTrue(req.getNeeds().getNode()) && !BooleanUtil.isTrue(req.getNeeds().getAncestorNode())) {
+            return;
+        }
+        Set<Long> nodeIds = records.stream().map(NodeUserDTO::getOrganizationalNodeId).collect(Collectors.toSet());
+        // assemble parentNode
+        Map<Long, OrgNodeDTO> nodesById = nodeService.list(ListNodeReq.builder()
+                .ids(nodeIds)
+                .includeAncestors(BooleanUtil.isTrue(req.getNeeds().getAncestorNode()))
+                .build()).stream().collect(Collectors.toMap(OrgNodeDTO::getId, Function.identity()));
+
+        records.forEach(r -> r.setNode(nodesById.get(r.getOrganizationalNodeId())));
+    }
+
 }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java

@@ -53,6 +53,8 @@ public class OrgJobFoundationServiceImpl implements OrgJobFoundationService {
         OrgJobQueryRepository.ListReq param = BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class);
         param.setIds(req.getJobIds());
         param.setCodes(req.getJobCodes());
+        param.setCode(req.getJobCode());
+        param.setNameLike(req.getJobNameLike());
         return param;
     }
 }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobPageParam.java

@@ -4,9 +4,6 @@ import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum;
 import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum;
 import cn.hutool.core.collection.CollUtil;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,6 +11,11 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * @author luofu
  * @version 1.0
@@ -42,7 +44,9 @@ public class OrgJobPageParam extends PageReqV2 {
     /**
      * 岗位编码集合
      */
-    private Set<String> jobCodes;
+    private Collection<String> jobCodes;
+    private String jobCode;
+    private String jobNameLike;
     /**
      * 岗位类型
      */

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/util/QueryConditionAssembler.java

@@ -0,0 +1,38 @@
+package cn.axzo.orgmanax.server.util;
+
+import cn.hutool.core.collection.CollUtil;
+import com.google.common.collect.ImmutableList;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class QueryConditionAssembler {
+    /**
+     * 组装查询条件的逻辑。
+     * 1、如果没有参数，或者所有参数都是empty，则返回empty
+     * 2、如果仅有一个参数不为empty，则返回该参数
+     * 3、如果存在多个不为empty的参数，将这些参数去交集
+     *
+     * @param collections
+     * @param <T>
+     * @return
+     */
+    @SafeVarargs
+    public static <T> Collection<T> assemble(Collection<T>... collections) {
+        if (collections == null || collections.length == 0) {
+            return ImmutableList.of();
+        }
+        Collection<Collection<T>> nonEmptyCollections = Stream.of(collections).filter(CollUtil::isNotEmpty).collect(Collectors.toList());
+        if (nonEmptyCollections.isEmpty()) {
+            return ImmutableList.of();
+        }
+        Collection<T> c1 = nonEmptyCollections.stream().findFirst().orElse(null);
+        Collection<T> c2 = nonEmptyCollections.stream().skip(1).findFirst().orElse(null);
+        if (CollUtil.isEmpty(c2)) {
+            return c1;
+        }
+        Collection<T>[] others = nonEmptyCollections.stream().skip(2).toArray(Collection[]::new);
+        return CollUtil.intersectionDistinct(c1, c2, others);
+    }
+}