代码提交

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

@@ -69,27 +69,31 @@ public class PeasantHouseholdController extends BaseController {
 		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 		// 处理项目地址
 		String area = "";
-		for (Integer reg : model.getProjectAddress())
-			for (RegionModel re : list) {
-				if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-					area = area + re.getRegionName() + "/";
-				}
-			}
-		model.setProjectAddressName(area.substring(0, area.length() - 2));
-		if ("1".equals(model.getIsPermanent())) {
-			model.setPermanentAddress(model.getProjectAddress());
-			model.setPermanentAddressDetail(model.getProjectAddressDetail());
-			model.setPermanentAddressName(area.substring(0, area.length() - 2));
-		}else {
-			// 处理常住地址
-			String permanent = "";
-			for (Integer reg : model.getPermanentAddress())
+		if(model.getProjectAddress().size() != 0) {
+			for (Integer reg : model.getProjectAddress())
 				for (RegionModel re : list) {
 					if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-						permanent = permanent + re.getRegionName() + "/";
+						area = area + re.getRegionName() + "/";
 					}
 				}
-			model.setPermanentAddressName(permanent.substring(0, permanent.length() - 2));
+			model.setProjectAddressName(area.substring(0, area.length() - 2));
+			if ("1".equals(model.getIsPermanent())) {
+				model.setPermanentAddress(model.getProjectAddress());
+				model.setPermanentAddressDetail(model.getProjectAddressDetail());
+				model.setPermanentAddressName(area.substring(0, area.length() - 2));
+			}else {
+				// 处理常住地址
+				String permanent = "";
+				if(model.getPermanentAddress().size() != 0) {
+					for (Integer reg : model.getPermanentAddress())
+						for (RegionModel re : list) {
+							if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+								permanent = permanent + re.getRegionName() + "/";
+							}
+						}
+					model.setPermanentAddressName(permanent.substring(0, permanent.length() - 2));
+				}
+			}
 		}
 
 		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());