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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/utils/JsonDiffUtil.java

@@ -118,4 +118,8 @@ public class JsonDiffUtil {
         return str == null || str.trim().isEmpty() || "null".equals(str);
     }
 
+    public static String nullToEmpty(String str) {
+        return isNullOrEmpty(str) ? "" : str;
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java

@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseRegisterCancelEquipEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import com.yeejoin.amos.boot.module.jg.biz.edit.utils.JsonDiffUtil;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
@@ -492,7 +493,7 @@ public class EquipClaimServiceImpl {
             jgUseRegistration.setIsXixian(Objects.toString(equipInfo.get("isXixian"), null));
         }
         CityCountyStreet result = getCityCountStreet(equipInfo, jgUseRegistration);
-        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + equipInfo.get("address"));
+        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(equipInfo.getString("address")));
 
 
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -50,6 +50,7 @@ import com.yeejoin.amos.boot.module.jg.biz.discardOrder.factory.DiscardOrderChec
 import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister.UseRegisterBackupManager;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.PieLineLevelTypeHandler;
+import com.yeejoin.amos.boot.module.jg.biz.edit.utils.JsonDiffUtil;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationAndGradeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -745,7 +746,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 map.put("estateUnitName", null);
             }
 
-            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
+            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(map.getString("address")));
             Optional.ofNullable(map.get("useRegistrationFormFile"))
                     .map(JSONObject::toJSONString)
                     .ifPresent(jgUseRegistration::setUseRegistrationFormFile);
@@ -1063,7 +1064,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     .collect(Collectors.joining());
 
             // 具体地址
-            useRegistration.setUseAddress("陕西省" + fullAddress + map.get("address"));
+            useRegistration.setUseAddress("陕西省" + fullAddress + JsonDiffUtil.nullToEmpty(map.getString("address")));
             useRegistration.setOriginProjectContraptionIds((String) map.get("originProjectContraptionIds"));
             // 使用登记表
             Optional.ofNullable(map.get("useRegistrationFormFile"))
@@ -4349,7 +4350,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 });
                 useStreetName = atomicUseStreet.get();
             }
-            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
+            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(map.getString("address")));
 
             if (map.containsKey("edit") && "1".equals(String.valueOf(map.get("edit")))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
@@ -4945,7 +4946,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     }
                 });
             }
-            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
+            jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(map.getString("address")));
             jgUseRegistration.setAuditPassDate(new Date());
             jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgUseRegistration);