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 6e2570296..f9a506cce 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 @@ -407,7 +407,7 @@ public class EmisBaseService { // 根据城市获取目的地 - if(areaId==null && !StringUtils.isEmpty(city)) { + if( (areaId==null || areaId==0) && !StringUtils.isEmpty(city)) { EmisRegion regionCity = getRegionByCode(city); if (regionCity != null) { areaId = regionCity.getAreaId(); @@ -415,7 +415,7 @@ public class EmisBaseService { } // 根据省获取目的地 - if(areaId==null && !StringUtils.isEmpty(province)){ + if((areaId==null || areaId==0) && !StringUtils.isEmpty(province)){ EmisRegion regionProvice= getRegionByCode(province); if(regionProvice!=null){ areaId=regionProvice.getAreaId(); @@ -423,7 +423,7 @@ public class EmisBaseService { } // 根据大区获取目的网点 - if(areaId!=null) { + if(areaId!=null && areaId>0) { EmisDestination queryEmisDestination = new EmisDestination(); queryEmisDestination.setCountryAreaId(areaId); queryEmisDestination.setStatus(1);