From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 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