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/XhProductModelDao.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b4287cb..5bb9c6b 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -4,10 +4,10 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select a.*
- from product_model a
+ select *
+ from product_model
<where>
- a.is_delete = 0
+ is_delete = 0
<if test="pid!=null">
and pid =${pid}
</if>
@@ -18,7 +18,8 @@
and ${whereSql}
</if>
</where>
- ORDER BY sort
+ ORDER BY
+ product_type,sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -31,6 +32,7 @@
<if test="pid==null">
and pid is null
</if>
+ and product_type =${productType}
</where>
Group by product_type
</select>
--
Gitblit v1.9.1