From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/ActivityMapper.xml | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
index 0362cd4..4b05374 100644
--- a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
@@ -32,10 +32,6 @@
<result column="activity_report_id" property="activityReportId"/>
</resultMap>
- <resultMap id="ActivityReportMap" type="cn.lili.modules.lmk.domain.vo.ActivityReportVO">
- <result column="activity_id" property="activityId"/>
- <result column="user_id" property="userId"/>
- </resultMap>
<select id="getMyActivityList" resultMap="MyActivityResultMap">
@@ -55,7 +51,7 @@
LEFT JOIN lmk_activity LA ON LAR.activity_id = LA.id
where LA.delete_flag = 0
AND LAR.delete_flag = 0
- AND LAR.user_id = #{query.id}
+ AND LAR.user_id = #{userId}
AND LAR.cancel = #{query.cancel}
<if test="query.status == null or query.status == ''">
AND LA.status != '宸茬粨鏉�'
@@ -148,19 +144,6 @@
WHERE LAR.activity_id = #{query.id}
</select>
-
- <update id="cancelActivity" >
- UPDATE
- lmk_activity_report LAR
- SET LAR.cancel = true where LAR.id = #{id}
- </update>
-
-
- <select id="getActivityReport" resultMap="ActivityReportMap">
- SELECT LAR.* FROM lmk_activity_report LAR
- WHERE LAR.user_id = #{query.userId} and LAR.activity_id = #{query.activityId}
- </select>
-
<update id="batchUpdateActivities">
UPDATE lmk_activity
<trim prefix="SET" suffixOverrides=",">
@@ -175,4 +158,5 @@
#{item.id}
</foreach>
</update>
+
</mapper>
--
Gitblit v1.8.0