From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/MyCollectMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml b/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
index 71af97c..9f89ba6 100644
--- a/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
@@ -90,8 +90,8 @@
LA.*
FROM lmk_my_collect LMC
LEFT JOIN lmk_activity LA
- ON LMC.ref_id = LA.id
- WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId}
+ ON LMC.ref_id = LA.id AND LMC.delete_flag = 0
+ WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId} AND LA.id IS NOT NULL
</select>
<resultMap id="videoBaseResult" type="cn.lili.modules.lmk.domain.vo.VideoVO">
<id column="id" property="id"/>
--
Gitblit v1.8.0