Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

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