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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index 6f83f46..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">
@@ -1063,5 +1064,17 @@
LV.delete_flag = 0
LIMIT #{start}, #{pageSize}
</select>
-
+ <resultMap id="videoUserBaseInfoMap" type="cn.lili.modules.lmk.domain.vo.VideoUserBaseInfo">
+ <result property="avatar" column="avatar"/>
+ <result property="nickName" column="nick_name"/>
+ </resultMap>
+ <select id="getVideoSysUserBaseInfo" resultMap="videoUserBaseInfoMap">
+ SELECT nick_name ,avatar FROM li_admin_user
+ WHERE id = #{id}
+ </select>
+ <select id="getVideoMemUserBaseInfo" resultMap="videoUserBaseInfoMap">
+ SELECT nick_name, face AS avatar
+ FROM li_member
+ WHERE id = #{id}
+ </select>
</mapper>
--
Gitblit v1.8.0