From 277b5047d00a3e9094bafd5ecb078976fbf6a92d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 18:59:04 +0800
Subject: [PATCH] 华玺砂浆转移-采购代码、发货和发货审核、报修和报修审核、采购模板,查询采购模板接口、财务管理的存货核算数据接口、财务管理的固定资产核算获取台账接口、采购审批,接口、客户分类字段、采购台账字段,实现采购异常记录的添加接口、黑名单,添加资质管理字段,可上传资质文件-至军泰伟业

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

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index ef786c4..e4e665c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -19,16 +19,14 @@
         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
     </select>
 
 

--
Gitblit v1.9.3