diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java
index 2858b2787..102422eee 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java
@@ -134,6 +134,23 @@ public class AssociationWarehouseApi extends BaseController{
         return AjaxResult.success(associationWarehouseCacheDO);
     }
 
+    /**
+     * 获取用户当前设置的仓库
+     */
+    @ApiOperation("获取当前登录用户设置的仓库")
+    @GetMapping("/getWarehouseInfoByUserId")
+    public AjaxResult getWarehouseInfoByUserId(@PathVariable("userId") Long userId) {
+        //转换实体
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (userId != null) {
+            AssociationWarehouseCacheDO associationWarehouseCacheDO = associationWarehouseApplicationService.getWarehouseInfo(userId);
+            return AjaxResult.success(associationWarehouseCacheDO);
+        } else {
+            AssociationWarehouseCacheDO associationWarehouseCacheDO = associationWarehouseApplicationService.getWarehouseInfo(loginUser.getUserid());
+            return AjaxResult.success(associationWarehouseCacheDO);
+        }
+    }
+
     /**
      * 直接从数据库获取指定用户设置的仓库（不使用缓存）
      */
@@ -144,4 +161,4 @@ public class AssociationWarehouseApi extends BaseController{
         return AjaxResult.success(associationWarehouseCacheDO);
     }
 
-}
+}
\ No newline at end of file