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() + "");