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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -164,6 +164,7 @@ public class SurveyInformationServiceImpl
 			JSONArray regionName = getRegionName();
 			List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 
+
 			// 更新勘察基本信息
 			SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(),
 					SurveyInformation.class);
@@ -266,12 +267,12 @@ public class SurveyInformationServiceImpl
 			peasantHousehold.setIdCard(surveyInfoAllDto.getSurveyInformation().getIdCard());
 			peasantHousehold.setMailbox(surveyInfoAllDto.getSurveyInformation().getMailbox());
 			peasantHousehold.setProjectAddress(surveyInfoAllDto.getSurveyInformation().getProjectAddress());
-			peasantHousehold.setProjectAddressDetail(surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail());
+			peasantHousehold.setProjectAddressDetail(surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail(): "" );
 			peasantHousehold.setPermanentAddress(surveyInfoAllDto.getSurveyInformation().getPermanentAddress());
 			peasantHousehold
-					.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail());
-			peasantHousehold
-					.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail());
+					.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() : "");
+//			peasantHousehold
+//					.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail(): "");
 
 			// 处理项目地址
 			String projectAddressName = "";