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 a23d8b5be..2e4ebae24 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
@@ -391,6 +391,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @return
      */
     private String getCountryCodeByName(String name){
+        if(StringUtils.isEmpty(name)){
+            return null;
+        }
+
         EmisCountry country=getCountryByName(name);
         if(country!=null){
             return country.getCode();
@@ -403,6 +407,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @return
      */
     private String getChildRegionCodeByName(String countryCode,String parentCode,String name){
+
+        if(StringUtils.isAnyEmpty(countryCode,parentCode,name)){
+            return null;
+        }
+
         EmisRegion region=getRegionByName(countryCode,parentCode,name);
         if(region!=null){
             return region.getRegionCode();