From 7e01fa073feadc9086cf5d8be0dd3e9f1a9b5d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 13 Mar 2023 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/DeptController.java | 7 ++++++- .../glxp/api/controller/auth/InvWarehouseController.java | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 8a3fcd40..419a0ce7 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -146,7 +146,12 @@ public class DeptController { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + if(authAdmin.getCustomerId().equals("110")){ + filterInvWarehouseRequest.setUserId(authAdmin.getId()); + }else{ + filterInvWarehouseRequest.setUserId(null); + } + filterInvWarehouseRequest.setPid(0); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 1a589088..e88b8163 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -81,7 +81,13 @@ public class InvWarehouseController extends BaseController { @GetMapping("spms/inv/warehouse/findByDeptUser") public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = getUser(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + if(authAdmin.getCustomerId().equals("110")){ + filterInvWarehouseRequest.setUserId(authAdmin.getId()); + }else{ + filterInvWarehouseRequest.setUserId(null); + } + + if (StrUtil.isEmpty(filterInvWarehouseRequest.getDeptCode())) { return ResultVOUtils.error(500, "部门不能为空"); }