From df4d51cbbadc891ad6ce991f8240dd1f95bfefc2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 24 Apr 2023 10:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=83=A8=E9=97=A8=20?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/auth/InvWarehouseDao.xml   | 31 ++++++++++---------
 .../mapper/thrsys/ThrInvWarehouseDao.xml      | 13 +++++---
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
index a2d4c438d..c69e2b570 100644
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@@ -145,22 +145,23 @@
     <insert id="insertInvSubWarehouse" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
         replace
-            INTO auth_warehouse
-        ( id, code, `name`, parentId, remark, defaultInv, advanceType, parentCode
-        , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
+        INTO auth_warehouse
+                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse,parentCode
+                , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
         values (#{id},
-                #{code},
-                #{name},
-                #{parentId},
-                #{remark},
-                #{defaultInv},
-                #{advanceType},
-                #{parentCode},
-                #{thirdId},
-                #{thirdId1},
-                #{thirdId2},
-                #{thirdId3},
-                #{thirdId4})
+        #{code},
+        #{name},
+        #{parentId},
+        #{remark},
+        #{defaultInv},
+        #{advanceType},
+        #{spUse},
+        #{parentCode},
+        #{thirdId},
+        #{thirdId1},
+        #{thirdId2},
+        #{thirdId3},
+        #{thirdId4})
     </insert>
 
 
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index 517773099..2fa1e303b 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -41,9 +41,14 @@
 
     <select id="selectByThrDeptCode" parameterType="com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest"
             resultType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
-        select * from thr_inv_warehouse where parentId not in (SELECT code FROM thr_dept
-         where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
-
+        select * from thr_inv_warehouse
+                 <where>
+                  parentId not in (SELECT code FROM thr_dept
+                     where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+                   <if test=" name != '' and name != null">
+                       and name like concat('%',#{name},'%')
+                   </if>
+                 </where>
     </select>
 
 
@@ -140,4 +145,4 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>