From d6811336d546e4963a9af3bd7cd8654d14193bce Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期四, 31 八月 2023 11:58:57 +0800 Subject: [PATCH] broker 卡车公司端 49码头 --- src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java index fd8cbff..9b49fd9 100644 --- a/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java +++ b/src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java @@ -249,12 +249,9 @@ @ResponseBody public Object getWarehouseFromId(int id,int pageNumber,int pageSize,String code) { Page<TWarehouse> tWarehousePage = new Page<>(pageNumber, pageSize); - Wrapper<TWarehouse> warehouseWrapper = new EntityWrapper<TWarehouse>().eq("port_id", id); - if(ToolUtil.isNotEmpty(code)){ - warehouseWrapper.like("code",code).or().like("state",code); - } - Page<TWarehouse> tWarehouses = warehouseService.selectPage(tWarehousePage,warehouseWrapper); - return new SuccessTip(tWarehouses); + List<TWarehouse> tWarehouses = warehouseService.getWarehouseFromId(tWarehousePage,id,code); + tWarehousePage.setRecords(tWarehouses); + return new SuccessTip(tWarehousePage); } @ApiOperation(value = "卡车公司- 根据id统一设置亚马逊价格",notes="卡车公司-根据id统一设置亚马逊价格") -- Gitblit v1.7.1