pageNo,pageSize放到controller

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

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()){