diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java index 9f51415d..02fd87af 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java @@ -171,13 +171,14 @@ public class HousingInformationController { } //没有户主信息的房屋,转换excel时,替换是否时会出现null,此时将对应null值替换成空字符 basePopulationInformationExcelList.forEach(basePopulationInformationExportDto ->{ - basePopulationInformationExportDto.setResidentsSex(""); - basePopulationInformationExportDto.setMilitaryService(""); - basePopulationInformationExportDto.setReemploymentPermit(""); - basePopulationInformationExportDto.setUnemploymentRegister(""); - basePopulationInformationExportDto.setDogStatus(""); - - }); + if(StringUtils.isBlank(basePopulationInformationExportDto.getId())){ + basePopulationInformationExportDto.setResidentsSex(""); + basePopulationInformationExportDto.setMilitaryService(""); + basePopulationInformationExportDto.setReemploymentPermit(""); + basePopulationInformationExportDto.setUnemploymentRegister(""); + basePopulationInformationExportDto.setDogStatus(""); + } + }); //根据获取的户主ID查询居住人信息 List basePopulationInformationExcelListWithHouseHead = new ArrayList<>(); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls index 3121b6a2..0063f2f8 100644 Binary files a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls and b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls differ