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 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 houseChangeList = baseDao.getHouseChangeList(formDTO); - pageData.setList(houseChangeList); - pageData.setTotal(houseChangeList.size()); - } + PageInfo 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; }