修改 部门 仓库问题

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
+        INTO auth_warehouse
-        ( id, code, `name`, parentId, remark, defaultInv, advanceType, parentCode
+                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse,parentCode
-        , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
+                , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
         values (#{id},
-                #{code},
+        #{code},
-                #{name},
+        #{name},
-                #{parentId},
+        #{parentId},
-                #{remark},
+        #{remark},
-                #{defaultInv},
+        #{defaultInv},
-                #{advanceType},
+        #{advanceType},
-                #{parentCode},
+        #{spUse},
-                #{thirdId},
+        #{parentCode},
-                #{thirdId1},
+        #{thirdId},
-                #{thirdId2},
+        #{thirdId1},
-                #{thirdId3},
+        #{thirdId2},
-                #{thirdId4})
+        #{thirdId3},
+        #{thirdId4})
     </insert>
 
 

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
+        select * from thr_inv_warehouse
-         where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+                 <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>
+</mapper>