From d1cae449713a95c4f5f50fd2ba20cf8876b3c834 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 16 Aug 2022 15:43:51 +0800
Subject: [PATCH] =?UTF-8?q?pageNo,pageSize=E6=94=BE=E5=88=B0controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IcResiUserController.java     | 6 ++++--
 .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 10006a97b0..e3e68fdbb9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -565,8 +565,8 @@ public class IcResiUserController implements ResultDataResolver {
             searchForm.setFormCode("resi_base_info");
             searchForm.setCustomerId(tokenDto.getCustomerId());
             searchForm.setStaffId(tokenDto.getUserId());
-            searchForm.setPageNo(pageFormDTO.getPageNo());
-            searchForm.setPageSize(pageFormDTO.getPageSize());
+            // searchForm.setPageNo(pageFormDTO.getPageNo());
+            // searchForm.setPageSize(pageFormDTO.getPageSize());
             List<ResiUserQueryValueDTO> conditions=new ArrayList<>();
             // ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO();
             // temp.setColumnName("");
@@ -577,6 +577,8 @@ public class IcResiUserController implements ResultDataResolver {
             searchForm.setConditions(conditions);
             pageFormDTO.setSearchForm(searchForm);
         }
+        pageFormDTO.getSearchForm().setPageNo(pageFormDTO.getPageNo());
+        pageFormDTO.getSearchForm().setPageSize(pageFormDTO.getPageSize());
         if (null == pageFormDTO.getExportConfig()) {
             IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
             exportTemplateSaveFormDTO.setFormCode("resi_base_info");
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
index f6bfe0ae75..f22a744046 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
@@ -164,8 +164,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
             allShowColumns.addAll(exportConfigData.getHiddenSqlColumns());
             do {
                 String finalStaffOrgPath = staffOrgPath;
-                // mapListPage = PageHelper.startPage(searchForm.getPageNo(), searchForm.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
-                mapListPage = PageHelper.startPage(exportResiUserFormDTO.getPageNo(), exportResiUserFormDTO.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
+                mapListPage = PageHelper.startPage(searchForm.getPageNo(), searchForm.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
                     icResiUserService.dynamicQuery(searchForm.getCustomerId(), searchForm.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, searchForm.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath);
                 });
                 if (!searchForm.getIsPage()){