From 51eac60f5d04af43f93590ad2219f9bdda313745 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 11:11:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.xml
index 1409a0d..7c6d76e 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.xml
@@ -17,7 +17,7 @@
<if test="condition.weight != null">
AND q.weight = #{condition.weight}
</if>
- ORDER BY q.sort_by
+ ORDER BY CASE WHEN q.parent_id IS NULL THEN 1 ELSE 2 END,q.sort_by, spcg.create_time
</select>
--
Gitblit v1.9.3