diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index f0a22db02..c9809b7e1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -213,7 +213,7 @@ and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') - and ltcl.driver_mobile like CONCAT('%',#{param.carNumber},'%') + and ltcl.car_number like CONCAT('%',#{param.carNumber},'%') and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%') diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java index 4b6bf7a4e..b3b5e8cd2 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java @@ -290,8 +290,9 @@ public class WarehouseWaybillController extends BladeController { myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId())); } waybillDTO.setWarehouseIds(warehouseIds); - List idslist = new ArrayList<>(); + List idslist = null; if (!Objects.isNull(waybillDTO.getIds())){ + idslist= new ArrayList<>(); List ids = Func.toLongList(",", waybillDTO.getIds()); idslist .addAll(ids) ; }