Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -235,11 +235,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(),formDTO.getAgencyNum());
-        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);
     }
 

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);