bug

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -319,17 +319,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
         //如果类型是house 查房屋
         //导出房屋
+        PageData<IcHouseListResultDTO> icHouseExcels = new PageData<>(new ArrayList<>(),NumConstant.ZERO);
         List<IcHouseListResultDTO> list = new ArrayList<>();
         Integer pageNo = NumConstant.ONE;
         do {
             formDTO.setPageNo(pageNo);
-            PageData<IcHouseListResultDTO> icHouseExcels = getHouseList(formDTO);
+            icHouseExcels = getHouseList(formDTO);
             if (CollectionUtils.isEmpty(icHouseExcels.getList())){
                 break;
             }
             list.addAll(icHouseExcels.getList());
             pageNo++;
-        }while (list.size() == formDTO.getPageSize());
+        }while (icHouseExcels.getList().size() == formDTO.getPageSize());
         TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx");
         Map<String,Object> map = new HashMap<>();
         map.put("maplist", list);