From d65c72126f95ad379b6b5302325812b1228976aa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 17:46:35 +0800
Subject: [PATCH] feat(production): 接口修改
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index ef786c4..a3214d0 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -15,20 +15,18 @@
<result column="product_id" property="productId" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
- select pm.*,p.product_name
+ select pm.*,p.product_name,
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