// BUG2168 居住地户籍所在地为空判断 bykongfm

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -65,10 +65,15 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     public void saveFirefighters(FirefightersInfoDto firefighters) {
         Firefighters firefighter = firefighters.getFirefighters();
         // 现居住地保存地址信息 户籍所在地信息 BUG3553 bykongfm
-        FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
-        firefighter.setResidence(region.getResult().getRegionName());
-        FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
-        firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+        // BUG2168 居住地户籍所在地为空判断 bykongfm
+        if(firefighter.getResidenceDetails() != null) {
+            FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+            firefighter.setResidence(region.getResult().getRegionName());
+        }
+        if(firefighter.getNativePlace() != null) {
+            FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+            firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+        }
         save(firefighter);
         FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
         firefightersContact.setFirefightersId(firefighter.getSequenceNbr());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -168,10 +168,15 @@ public class FirefightersController extends BaseController {
 			@RequestBody FirefightersInfoDto firefighters) {
 		try {
 			Firefighters firefighter = firefighters.getFirefighters();
-			FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
-			firefighter.setResidence(region.getResult().getRegionName());
-			FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
-			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+			// BUG2168 居住地户籍所在地为空判断 bykongfm
+			if(firefighter.getResidenceDetails() != null) {
+				FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+				firefighter.setResidence(region.getResult().getRegionName());
+			}
+			if(firefighter.getNativePlace() != null) {
+				FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+				firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+			}
 			iFirefightersService.updateById(firefighter);
 			ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
 			// 删除缓存