From 1ac0188d8c5bc55d57a1f6c368cb41da8cb5cbb0 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 28 Oct 2024 19:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=AF=BC=E5=87=BA=E3=80=81?= =?UTF-8?q?=E5=88=B0=E8=BD=A6=E8=AE=A1=E5=88=92=E6=90=9C=E7=B4=A2BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml | 2 +- .../logpm/warehouse/controller/WarehouseWaybillController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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) ; }