From 1cb563a3fe9e04ba524961f4ae56305c0ee7407c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 06 一月 2026 11:29:20 +0800
Subject: [PATCH] 生产报工-产出api

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 799257d..e4e665c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -19,14 +19,11 @@
         from product_model pm
         left join product p on pm.product_id = p.id
         <where>
-            <if test="c.model != null || c.model != ''">
-                and pm.model = like  concat('%',#{c.model},'%')
+            <if test="c.model != null and c.model != ''">
+                and pm.model  like  concat('%',#{c.model},'%')
             </if>
-            <if test="c.productName != null || c.productName != ''">
-                and p.product_name = like  concat('%',#{c.productName},'%')
-            </if>
-            <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
+            <if test="c.productName != null and c.productName != ''">
+                and p.product_name  like  concat('%',#{c.productName},'%')
             </if>
         </where>
         order by  pm.id

--
Gitblit v1.9.3