diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java index 4c4202340..4e54e937c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java @@ -88,7 +88,8 @@ public class EmisDestinationController extends BaseController },value= EmisDestination.class,type= JacksonFilter.JscksonFilterType.RESPONSE) public AjaxResult getDestSite(String country,String lineCode,String province,String city,String county,String address) { - if(StringUtils.isAnyEmpty(lineCode,province)){ +// lineCode, + if(StringUtils.isAnyEmpty(province)){ return AjaxResult.error("参数错误,线路和省份不能为空!"); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java index 9fd2030dc..2650621f0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisDestinationServiceImpl.java @@ -103,7 +103,7 @@ public class EmisDestinationServiceImpl implements IEmisDestinationService if(areaId != null && areaId> 0 ){ // 查询目的地,优先根据区域查询,如果查询不到则按线路查询 queryEmisDestination = new EmisDestination(); - queryEmisDestination.setLineCode(lineCode); +// queryEmisDestination.setLineCode(lineCode); queryEmisDestination.setCountryAreaId(areaId); destinationList=emisDestinationMapper.selectEmisDestinationList(queryEmisDestination); if(!CollectionUtil.isEmpty(destinationList)){