From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/resources/mapper/MatMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f878349..a244da7 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,12 @@
<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>
+ <if test="model != null and model != ''">
+ and mm.model like concat('%',#{model},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
--
Gitblit v1.9.1