From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
index 84fa2fc..674c05e 100644
--- a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -5,7 +5,7 @@
<update id="updateByDefault">
update sys_picture_base
set is_default=2
- where id != ${id}
+ where id <> ${id}
and product_type = ${productType}
and is_delete = 0
</update>
@@ -39,9 +39,7 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY is_default,product_type,id
</select>
<select id="getDefaultImg" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
select a.name, a.id
--
Gitblit v1.9.1