Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into pudong

王通
2 parents 6400c4cc 69a5eced
Showing 1 changed file with 2 additions and 0 deletions
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
@@ -133,6 +133,7 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     public void validate_cars(Integer xlId, Integer clId) throws ScheduleException {
         Map<String, Object> param = new HashMap<>();
         param.put("cl.id_eq", clId);
+        param.put("isCancel_eq", false);
         List<CarConfigInfo> carConfigInfos = list(param);
         for (CarConfigInfo carConfigInfo : carConfigInfos) {
             if (!carConfigInfo.getXl().getId().equals(xlId)) {
@@ -146,6 +147,7 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", carConfigInfo.getXl().getId());
         param.put("cl.id_eq", carConfigInfo.getCl().getId());
+        param.put("isCancel_eq", false);
         List<CarConfigInfo> carConfigInfos = list(param);
         if (CollectionUtils.isEmpty(carConfigInfos)) {
             throw new ScheduleException("当前车辆没有配置在当前线路中，不属于当前线路！");