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<DeptEntity> 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, "部门不能为空");
         }