From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 framework/src/main/resources/mapper/lmk/VideoMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index 58a6600..dc56251 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -300,7 +300,7 @@
             LV.delete_flag = 0
           AND LV.STATUS = '1'
           AND LV.video_type = #{query.videoType}
-          AND lm.id IS NOT NULL
+          AND LM.id IS NOT NULL
         UNION ALL
         SELECT
             LV.author_id,
@@ -334,8 +334,9 @@
             LV.delete_flag = 0
           AND LV.STATUS = '1'
           AND LV.video_type = #{query.videoType}
-          AND lm.id IS NOT NULL
+          AND LM.id IS NOT NULL
         ORDER BY
+            recommend DESC,
             create_time DESC
     </select>
     <select id="recommendVideoByVideoId" resultMap="WxResultMap">

--
Gitblit v1.8.0