From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
index 2d9c7b9..621053a 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
@@ -13,9 +13,10 @@
END AS productIdInit
FROM
product_model a
- LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}'
+ LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}' and b.is_delete = 0
<where>
a.is_delete = 0
+ and a.product_type <> 10
<if test="srcId!=null">
and a.pid =${srcId}
</if>
@@ -26,19 +27,15 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY
+ a.product_type,a.sort
</select>
<select id="getParamData" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
- SELECT
- a.*
- FROM
- param_data a
- WHERE
- a.is_delete = 0
- and a.product_id=#{productId}
- and a.page_code=#{pageCode}
+ SELECT a.*
+ FROM param_data a
+ WHERE a.is_delete = 0
+ and a.product_id = #{productId}
+ and a.page_code = #{pageCode}
limit 1
</select>
--
Gitblit v1.9.1