From b5130c2e6d60c7f23e37f7c620375bc4e253caa3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 14:52:20 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 3a5c151..0a13399 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -34,7 +34,7 @@
         <result column="dead_time" property="deadTime" />
         <result column="dead_warn" property="deadWarn" />
         <result column="source" property="source" />
-        <result column="check" property="check" />
+        <result column="inspect" property="inspect" />
         <result column="danger" property="danger" />
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
@@ -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