diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
index a3649948d..7765d64bb 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
@@ -43,9 +43,9 @@ public class WarehouseApplicationService {
     public List<WarehousePO> queryList(WarehouseDO warehouseDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (loginUser != null){
-            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                warehouseDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            Long organizationId = loginUser.getUserPo().getOrganizationId();
+            if (organizationId != null && organizationId != 1){
+                warehouseDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             }
         }
         return warehouseDomainService.queryList(warehouseDO);
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml
index 012a4c227..e60d2da3c 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and top_organization_id = #{topOrganizationId}
         </if>
         <if test="warehouseCode != null  and warehouseCode != ''">
-            and warehouse_code = #{warehouseCode}
+            and warehouse_code like concat('%', #{warehouseCode}, '%')
         </if>
         <if test="warehouseName != null  and warehouseName != ''">
             and warehouse_name like concat('%', #{warehouseName}, '%')