From 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 12 九月 2024 17:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/flower/FlowerMarkupSpCgMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpCgMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpCgMapper.xml
index 919d7c1..d892d8f 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpCgMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpCgMapper.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