From d80dd0abcb56aacf30bc32e424ff398f7ccce730 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 13:17:00 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/MatMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index aa1dd26..cc2280a 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -31,17 +31,23 @@
 
     </resultMap>
 
-    <select id="listByPageByArea" resultMap="BaseResultMap">
+    <select id="listByPage" resultMap="BaseResultMap">
         SELECT
         mm.*
         FROM man_mat mm
-        LEFT JOIN man_tag mt ON mm.`tag_id` = mt.`id`
+        LEFT JOIN man_tag mt ON mm.tag_id = mt.id
         WHERE 1=1
-        AND (FIND_IN_SET(#{tagId}, mt.`path`) OR mt.`id` = #{tagId})
+        AND (CHARINDEX(#{tagId}, ','+mt.path+',') > 0 OR mt.id = #{tagId})
+        <if test="matnr != null and matnr != ''">
+            and mm.matnr like concat('%',#{matnr},'%')
+        </if>
+        <if test="maktx != null and maktx != ''">
+            and mm.maktx like concat('%',#{maktx},'%')
+        </if>
         ORDER BY mm.create_time DESC
     </select>
 
     <select id="selectByMatnr" resultMap="BaseResultMap">
-        select * from man_mat where 1=1 and matnr = #{matnr}
+        select top 1 * from man_mat where 1=1 and matnr = #{matnr}
     </select>
 </mapper>

--
Gitblit v1.9.1