From 0eb88e00dc35d322071d28130ec279b6105bac1c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 21 Oct 2020 09:50:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=99=84=E8=BF=91=E7=BD=91=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/StrangerAccessRecordServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index 0157b798ad..72e16e1dfd 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -266,7 +266,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
                 formDTO.getSelectedAreaCode() : formDTO.getAreaCode());
         //分页参数设置
         third.setPageNo(null == formDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : formDTO.getPageNo());
-        third.setPageSize(formDTO.getPageSize());
+        //third.setPageSize(formDTO.getPageSize());
+        third.setPageSize(200);
 
         //2.调用gov-org服务，查询客户网格列表数据
         Result<List<PublicCustomerGridForStrangerResultDTO>> queryResult = govOrgFeignClient.queryCustomerGridList(third);

From 97e59930063af5fe66048a757bdec7cfbf1313f8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 21 Oct 2020 16:24:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=BA=A7=E7=BB=84=E7=BB=87=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/AgencyServiceImpl.java  | 18 ++++++++++++++----
 .../resources/mapper/CustomerAgencyDao.xml     |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 826e186d7f..7595aafa33 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -237,11 +237,21 @@ public class AgencyServiceImpl implements AgencyService {
     @Override
     public Result<SubAgencyResultDTO> subAgencyList(SubAgencyFormDTO formDTO) {
         SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO();
-        //1:根据当前机关Id查询直属下一级机关列表
+        //1:根据当前机关Id查询直属下一级机关列表，只返回前十条
         List<SubListResultDTO> agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId());
-        subAgencyResultDTO.setAgencyList(null == agencyList ? new ArrayList<SubListResultDTO>() : agencyList);
-        //2:统计下一级机关数
-        subAgencyResultDTO.setSubAgencyCount(agencyList.size());
+        if (null == agencyList || agencyList.size() < NumConstant.ONE) {
+            subAgencyResultDTO.setAgencyList(new ArrayList<SubListResultDTO>());
+            subAgencyResultDTO.setSubAgencyCount(NumConstant.ZERO);
+        } else {
+            subAgencyResultDTO.setSubAgencyCount(agencyList.size());
+            if (agencyList.size() > NumConstant.TEN) {
+                List<SubListResultDTO> newList = agencyList.subList(NumConstant.ZERO, NumConstant.TEN);
+                subAgencyResultDTO.setAgencyList(newList);
+            } else {
+                subAgencyResultDTO.setAgencyList(agencyList);
+            }
+        }
+
         return new Result<SubAgencyResultDTO>().ok(subAgencyResultDTO);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 0721780e09..4e295b44cf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -67,7 +67,6 @@
         WHERE del_flag = '0'
         AND pid = #{pId}
         ORDER BY created_time DESC
-        LIMIT 10
     </select>
 
     <select id="selectAgencyList" resultType="com.epmet.dto.result.AgencyListResultDTO">