From 14dcecb5d498ddff83da6a33eb6e9bad6fd4d968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Thu, 5 Feb 2026 16:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BC=96=E7=A0=81=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/warehouse/WarehouseApplicationService.java      | 6 +++---
 .../resources/mapper/basic/warehouse/WarehouseMapper.xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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}, '%')