|
|
@ -1053,7 +1053,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf |
|
|
|
String residentsName = BaseResidentInformationUpdateExcel.getUserName() == null ? null : BaseResidentInformationUpdateExcel.getUserName().trim(); |
|
|
|
String residentsSex = BaseResidentInformationUpdateExcel.getGender() == null ? null : BaseResidentInformationUpdateExcel.getGender().trim(); |
|
|
|
String residentsNation = BaseResidentInformationUpdateExcel.getNation() == null ? null : BaseResidentInformationUpdateExcel.getNation().trim(); |
|
|
|
String currentEmployer = BaseResidentInformationUpdateExcel.getCurrentEmployer() == null ? null : BaseResidentInformationUpdateExcel.getCurrentEmployer().trim(); |
|
|
|
String workUnits = BaseResidentInformationUpdateExcel.getWorkUnits() == null ? null : BaseResidentInformationUpdateExcel.getWorkUnits().trim(); |
|
|
|
String currentAddress = BaseResidentInformationUpdateExcel.getCurrentAddress() == null ? null : BaseResidentInformationUpdateExcel.getCurrentAddress().trim(); |
|
|
|
String specialCrowd = BaseResidentInformationUpdateExcel.getSpecialCrowd() == null ? null : BaseResidentInformationUpdateExcel.getSpecialCrowd().trim(); |
|
|
|
String peopleCategories = BaseResidentInformationUpdateExcel.getPeopleCategories() == null ? null : BaseResidentInformationUpdateExcel.getPeopleCategories().trim(); |
|
|
@ -1097,8 +1097,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf |
|
|
|
if (StringUtils.isNotBlank((residentsNation))) { |
|
|
|
BaseResidentInformationUpdateExcel.setNation(residentsNation); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank((currentEmployer))) { |
|
|
|
BaseResidentInformationUpdateExcel.setCurrentEmployer(currentEmployer); |
|
|
|
if (StringUtils.isNotBlank((workUnits))) { |
|
|
|
BaseResidentInformationUpdateExcel.setWorkUnits(workUnits); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank((currentAddress))) { |
|
|
|
BaseResidentInformationUpdateExcel.setCurrentAddress(currentAddress); |
|
|
|