使用单位变更导出

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/JgChangeRegistrationUnitServiceImpl.java

@@ -704,11 +704,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             throw new BadRequest("使用登记证导出失败,请稍后重试!");
         }
         //是否废弃
-        exportParamsMap.put("isInvalid", jgChangeRegistrationUnitEq.getIsInvalid());
+        exportParamsMap.put("isInvalid",  ValidationUtil.isEmpty(jgChangeRegistrationUnitEq.getIsInvalid()) ? "0" : jgChangeRegistrationUnitEq.getIsInvalid());
         //登记机关
         exportParamsMap.put("receiveOrgName", transfer.getReceiveOrgName());
         //使用登记证编号
-        exportParamsMap.put("useRegistrationCode", transfer.getUseRegistCode());
+        exportParamsMap.put("useRegistrationCode", ValidationUtil.isEmpty(transfer.getUseRegistCode()) ? "" : transfer.getUseRegistCode());
         //使用单位名称
         exportParamsMap.put("useUnitName", transfer.getUseUnitName());
         //监管码
@@ -753,11 +753,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
 
             String fullAddress="";
-            String province = useInfo.getProvinceName();
-            String city = useInfo.getCityName();
-            String county = useInfo.getCountyName();
-            String street = useInfo.getStreetName();
-            String address = useInfo.getAddress();
+            String province = ValidationUtil.isEmpty(useInfo.getProvinceName()) ? "" :  useInfo.getProvinceName();
+            String city =  ValidationUtil.isEmpty(useInfo.getCityName()) ? "" :  useInfo.getCityName();
+            String county = ValidationUtil.isEmpty(useInfo.getCountyName()) ? "" :  useInfo.getCountyName();
+            String street = ValidationUtil.isEmpty(useInfo.getStreetName()) ? "" :  useInfo.getStreetName();
+            String address = ValidationUtil.isEmpty(useInfo.getAddress()) ? "" :  useInfo.getAddress();
             fullAddress = province + city + county + street + address;
             exportParamsMap.put("fullAddress", fullAddress);
         }