From 809014565c40e3fd8eb8b5c3af8429fc3dcc0e4e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 17 Nov 2024 22:27:01 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java  | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 5440dff21..7c404261e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -458,8 +458,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(rcvProviceCode==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");
         }
-        String rcvCityCode=getChildRegionCodeByName(receiveCountryCode,rcvProviceCode,emisWaybillSave.getReceiveCity());
-        String rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode,rcvCityCode,emisWaybillSave.getReceiveCounty());
+
+
+        String rcvCityCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCity())) {
+            rcvCityCode=getChildRegionCodeByName(receiveCountryCode, rcvProviceCode, emisWaybillSave.getReceiveCity());
+        }
+
+        String rcvDistrictCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCounty())) {
+            rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode, rcvCityCode, emisWaybillSave.getReceiveCounty());
+        }
 
         emisWaybillSave.setReceiveCountry(receiveCountryCode);
         emisWaybillSave.setReceiveProvince(rcvProviceCode);
@@ -475,8 +484,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(sendProviceCode==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确");
         }
-        String sendCityCode=getChildRegionCodeByName(sendCountryCode,sendProviceCode,emisWaybillSave.getSendCity());
-        String sendDistrictCode=getChildRegionCodeByName(sendCountryCode,sendCityCode,emisWaybillSave.getSendCounty());
+        String sendCityCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getSendCity())) {
+            sendCityCode=getChildRegionCodeByName(sendCountryCode, sendProviceCode, emisWaybillSave.getSendCity());
+        }
+
+        String sendDistrictCode = null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getSendCounty())) {
+             sendDistrictCode = getChildRegionCodeByName(sendCountryCode, sendCityCode, emisWaybillSave.getSendCounty());
+        }
 
         emisWaybillSave.setSendCountry(sendCountryCode);
         emisWaybillSave.setSendProvince(sendProviceCode);
@@ -686,8 +702,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(rcvProviceCode==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");
         }
-        String rcvCityCode=getChildRegionCodeByName(receiveCountryCode,rcvProviceCode,emisWaybillSave.getReceiveCity());
-        String rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode,rcvCityCode,emisWaybillSave.getReceiveCounty());
+
+        String rcvCityCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCity())) {
+            rcvCityCode=getChildRegionCodeByName(receiveCountryCode, rcvProviceCode, emisWaybillSave.getReceiveCity());
+        }
+
+        String rcvDistrictCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCounty())) {
+            rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode, rcvCityCode, emisWaybillSave.getReceiveCounty());
+        }
 
         emisWaybillSave.setReceiveCountry(receiveCountryCode);
         emisWaybillSave.setReceiveProvince(rcvProviceCode);
@@ -703,8 +727,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(sendProviceCode==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确");
         }
-        String sendCityCode=getChildRegionCodeByName(sendCountryCode,sendProviceCode,emisWaybillSave.getSendCity());
-        String sendDistrictCode=getChildRegionCodeByName(sendCountryCode,sendCityCode,emisWaybillSave.getSendCounty());
+
+        String sendCityCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getSendCity())) {
+            sendCityCode=getChildRegionCodeByName(sendCountryCode, sendProviceCode, emisWaybillSave.getSendCity());
+        }
+        String sendDistrictCode=null;
+        if(!StringUtils.isEmpty(emisWaybillSave.getSendCounty())) {
+            sendDistrictCode=getChildRegionCodeByName(sendCountryCode, sendCityCode, emisWaybillSave.getSendCounty());
+        }
 
         emisWaybillSave.setSendCountry(sendCountryCode);
         emisWaybillSave.setSendProvince(sendProviceCode);