From b2bc9f628762fed947bb931c207ff2fe1d20bb35 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 12 May 2022 09:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcHouseChangeRecordServiceImpl.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
index f1ccb252aa..22da0f3a3e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
@@ -105,15 +105,9 @@ public class IcHouseChangeRecordServiceImpl extends BaseServiceImpl<IcHouseChang
             throw new EpmetException("未查询到此工作人员"+tokenDto.getUserId());
         }
         formDTO.setAgencyId(staffInfo.getAgencyId());
-        if (formDTO.getIsPage()){
-            PageInfo<HouseChangeListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO));
-            pageData.setList(pageInfo.getList());
-            pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
-        }else {
-            List<HouseChangeListResultDTO> houseChangeList = baseDao.getHouseChangeList(formDTO);
-            pageData.setList(houseChangeList);
-            pageData.setTotal(houseChangeList.size());
-        }
+        PageInfo<HouseChangeListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO));
+        pageData.setList(pageInfo.getList());
+        pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
         return pageData;
     }