代码提交

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -69,6 +69,7 @@ public class PeasantHouseholdController extends BaseController {
 		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 		// 处理项目地址
 		String area = "";
+		if(model.getProjectAddress().size() != 0) {
 			for (Integer reg : model.getProjectAddress())
 				for (RegionModel re : list) {
 					if (re.getRegionCode().equals(Integer.valueOf(reg))) {
@@ -83,6 +84,7 @@ public class PeasantHouseholdController extends BaseController {
 			}else {
 				// 处理常住地址
 				String permanent = "";
+				if(model.getPermanentAddress().size() != 0) {
 					for (Integer reg : model.getPermanentAddress())
 						for (RegionModel re : list) {
 							if (re.getRegionCode().equals(Integer.valueOf(reg))) {
@@ -91,6 +93,8 @@ public class PeasantHouseholdController extends BaseController {
 						}
 					model.setPermanentAddressName(permanent.substring(0, permanent.length() - 2));
 				}
+			}
+		}
 
 		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
 		model.setSurveyOrNot(0);