From 1d2f030f67111281103667f0b8d0bd9c522766f7 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 6 Jul 2023 16:34:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=AB=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index 2fc01d81..9c5c38af 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -408,7 +408,7 @@
 
     <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
         select auth_warehouse.`code`,
-               auth_warehouse.name,
+               auth_warehouse.name warehouseName,
                auth_warehouse.parentId,
                auth_warehouse.parentCode,
                auth_dept.code deptCode,

From 7bdaf137b6be7d940032456f09112de5554fc759 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 6 Jul 2023 16:39:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/auth/InvWarehouseDao.xml       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index 9c5c38af..eababa0a 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -408,15 +408,14 @@
 
     <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
         select auth_warehouse.`code`,
-               auth_warehouse.name warehouseName,
-               auth_warehouse.parentId,
-               auth_warehouse.parentCode,
-               auth_dept.code deptCode,
-               auth_dept.name deptName,
-               auth_warehouse.advanceType
+        auth_warehouse.name,
+        auth_warehouse.parentId,
+        auth_warehouse.parentCode,
+        auth_dept.name warehouseName,
+        auth_warehouse.advanceType
         from auth_warehouse
-                     inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                     LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+        inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+        LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}