From 9880fb9c0d0a1445d7288d8b0022065cccfff3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 10:06:19 +0800
Subject: [PATCH] Merge branch 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs

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

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f878349..0a13399 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -60,6 +60,7 @@
             group by matnr
         ) as mld on mld.matnr = mm.matnr
         WHERE 1=1
+        and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
         AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
         <if test="matnr != null and matnr != ''">
             and mm.matnr like concat('%',#{matnr},'%')
@@ -67,6 +68,9 @@
         <if test="maktx != null and maktx != ''">
             and mm.maktx like concat('%',#{maktx},'%')
         </if>
+        <if test="specs != null and specs != ''">
+            and mm.specs like concat('%',#{specs},'%')
+        </if>
         ORDER BY mm.create_time DESC
     </select>
 

--
Gitblit v1.9.1