From bb3ffface7ae7b141dbee5feb7901931e4f0b5a5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 02:15:41 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index aaa90ca16..f0398741d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -398,13 +398,15 @@ public class EmisBaseService {
          Long areaId = null;
 
          // 根据城市获取目的地
-         EmisRegion regionCity= getRegionByCode(city);
-         if(regionCity!=null){
-             areaId=regionCity.getAreaId();
+         if(!StringUtils.isEmpty(city)) {
+             EmisRegion regionCity = getRegionByCode(city);
+             if (regionCity != null) {
+                 areaId = regionCity.getAreaId();
+             }
          }
 
          // 根据城市获取目的地
-         if(areaId==null){
+         if(areaId==null && !StringUtils.isEmpty(province)){
              EmisRegion regionProvice= getRegionByCode(province);
              if(regionProvice!=null){
                  areaId=regionProvice.getAreaId();
@@ -435,7 +437,7 @@ public class EmisBaseService {
              }
          }
 
-         if(destination==null){
+         if(destination==null && !StringUtils.isEmpty(countryCode)){
              // 根据国家查询
              EmisDestination queryEmisDestination = new EmisDestination();
              queryEmisDestination.setCountry(countryCode);