From fd95223d9703b9c038ed3c782474c885052dda08 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 22 十二月 2023 17:05:25 +0800 Subject: [PATCH] 代码整理 --- consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java index 0b53c60..20a94db 100644 --- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java +++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java @@ -177,7 +177,7 @@ if (agencyId == null) { return ResponseValue.success(new ArrayList<>()); } - List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null); + List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue()); if (list == null) { return ResponseValue.error("鏌ヨ澶辫触锛�"); } @@ -197,8 +197,8 @@ Long warehouseId = warehouseQry.getWarehouseId(); if (warehouseId == null) { Long agencyId = warehouseQry.getAgencyId(); - BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId); - warehouseId = defaultWarehouseByAgencyId.getId(); + BaseWarehouse baseWarehouse = baseWarehouseService.getWarehouseByAgencyId(agencyId, null); + warehouseId = baseWarehouse.getId(); } Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId(); Integer warehouseType = warehouseQry.getWarehouseType(); -- Gitblit v1.9.1