From cc8e5ed21277fc7969328612be2bad0834cc8dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E6=95=8F?= <zhoumin@axzo.cn>
Date: Wed, 25 Dec 2024 17:04:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E6=8F=90=E4=BE=9BbriefDTO?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=81=9A=E5=90=88=20step2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/http/nodeuser/node-user.http    |  5 ++--
 .../impl/OrgJobQueryRepositoryImpl.java       | 11 +++++----
 .../unit/repository/UnitQueryRepository.java  | 23 +++----------------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/orgmanax-api/src/test/resources/http/nodeuser/node-user.http b/orgmanax-api/src/test/resources/http/nodeuser/node-user.http
index 2ee10a5..498630f 100644
--- a/orgmanax-api/src/test/resources/http/nodeuser/node-user.http
+++ b/orgmanax-api/src/test/resources/http/nodeuser/node-user.http
@@ -12,8 +12,9 @@ Accept: application/json
   "includeDeleted": true,
   "pageSize": 2,
   "needs": {
-    "job": true,
-    "node": true,
+    "job": true
+    ,
+    "node": true ,
     "unit": true
   }
 }
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java
index 9c2c04c..ea3611e 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java
@@ -10,11 +10,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @Repository
 public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository {
@@ -28,14 +29,14 @@ public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository {
         QueryWrapper<OrgJob> wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class);
         if (StringUtils.isNotBlank(req.getKeyword())) {
             wrapper.and(wr -> wr.like("name", req.getKeyword())
-                .or()
-                .like("alias", req.getKeyword()));
+                    .or()
+                    .like("alias", req.getKeyword()));
         }
         if (wrapper.isEmptyOfWhere()) {
             return PageResp.<JobResp>builder().build();
         }
-        IPage<OrgJob> results = orgJobDao.page(page, wrapper)
-                .convert(e -> BeanUtil.toBean(e, OrgJob.class));
+        IPage<JobResp> results = orgJobDao.page(page, wrapper)
+                .convert(e -> BeanUtil.toBean(e, JobResp.class));
         PageResp<JobResp> resp = PageConverter.toResp(results);
         List<JobResp> records = resp.getData();
         if (CollUtil.isEmpty(records)) {
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
index 71ee1da..b2da7f4 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
@@ -2,7 +2,6 @@ package cn.axzo.orgmanax.infra.dao.unit.repository;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.foundation.page.IPageReq;
 import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
@@ -22,10 +21,8 @@ public interface UnitQueryRepository {
     PageResp<UnitResp> page(ListReq paramReq);
 
     default List<UnitResp> list(ListReq req) {
-        PageReq pageReq = BeanUtil.toBean(req, PageReq.class);
-        pageReq.setPage(1);
-        pageReq.setPageSize(1000);
-        return page(pageReq).getData();
+        req.setSearchCount(false);
+        return page(req).getData();
     }
 
     default UnitResp one(OneReq req) {
@@ -34,7 +31,7 @@ public interface UnitQueryRepository {
 
     default Optional<UnitResp> oneOpt(OneReq req) {
         req.check();
-        PageReq page = BeanUtil.toBean(req, PageReq.class);
+        ListReq page = BeanUtil.toBean(req, ListReq.class);
         page.setPage(1);
         page.setPageSize(1);
         return page(page).getData().stream().findFirst();
@@ -120,20 +117,6 @@ public interface UnitQueryRepository {
         private Boolean includeDeleted;
     }
 
-    @EqualsAndHashCode(callSuper = true)
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Data
-    @SuperBuilder
-    class PageReq extends ListReq implements IPageReq {
-        @CriteriaField(ignore = true)
-        Integer page;
-        @CriteriaField(ignore = true)
-        Integer pageSize;
-        @CriteriaField(ignore = true)
-        List<String> sort;
-    }
-
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
     @AllArgsConstructor