diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index 51cc5de923..77aa8fdaf5 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.187
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.188
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index b2897a67ff..d0e5b00d4c 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.187</version>
+    <version>0.3.188</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index 70a6aceb54..de2c65b9a4 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.97
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.98
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 8ea95a22bc..7eb641eafb 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.97</version>
+    <version>0.3.98</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
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">
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);