aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-28 02:15:41 +08:00
parent 77ee9ad768
commit bb3ffface7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -398,13 +398,15 @@ public class EmisBaseService {
Long areaId = null; Long areaId = null;
// 根据城市获取目的地 // 根据城市获取目的地
EmisRegion regionCity= getRegionByCode(city); if(!StringUtils.isEmpty(city)) {
if(regionCity!=null){ EmisRegion regionCity = getRegionByCode(city);
areaId=regionCity.getAreaId(); if (regionCity != null) {
areaId = regionCity.getAreaId();
}
} }
// 根据城市获取目的地 // 根据城市获取目的地
if(areaId==null){ if(areaId==null && !StringUtils.isEmpty(province)){
EmisRegion regionProvice= getRegionByCode(province); EmisRegion regionProvice= getRegionByCode(province);
if(regionProvice!=null){ if(regionProvice!=null){
areaId=regionProvice.getAreaId(); areaId=regionProvice.getAreaId();
@ -435,7 +437,7 @@ public class EmisBaseService {
} }
} }
if(destination==null){ if(destination==null && !StringUtils.isEmpty(countryCode)){
// 根据国家查询 // 根据国家查询
EmisDestination queryEmisDestination = new EmisDestination(); EmisDestination queryEmisDestination = new EmisDestination();
queryEmisDestination.setCountry(countryCode); queryEmisDestination.setCountry(countryCode);