From 22f86ca4880c8071b14af1398fb7010f0aa4fd2a Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Mon, 31 Oct 2022 09:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=C3=B7?= =?UTF-8?q?=E6=AC=A1=E7=99=BB=E5=BD=95=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inventory/InvSubWarehouseController.java | 5 ++++- .../admin/controller/inventory/InvWarehouseController.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 8074633..bc30019 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -70,8 +70,11 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { - if (!authAdmin.getCustomerId().equals("110")) + if (authAdmin.getCustomerId().equals("110")) filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); + else{ + filterInvWarehouseRequest.setSpUse(true); + } } List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index f97df54..3be4f5d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -185,6 +185,7 @@ public class InvWarehouseController { if (!authAdmin.getCustomerId().equals("110")) { filterInvWarehouseRequest.setPcode("0"); filterInvWarehouseRequest.setStatus(1); + filterInvWarehouseRequest.setSpUse(true); invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); } else { filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");