From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
index 098f5a8..a6818ea 100755
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -126,12 +126,18 @@
</if>
</insert>
- <!-- 鏌ヨ娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
+ <!-- 鏌ヨ娲诲姩淇℃伅 add by wuxw 2018-07-03
+
+ -->
<select id="getActivitiesInfo" parameterType="Map" resultType="Map">
select t.collect_count,t.collect_count collectCount,t.like_count,t.like_count likeCount,t.status_cd,t.status_cd
statusCd,t.title,t.read_count,t.read_count readCount,t.user_name,t.user_name userName,t.user_id,t.user_id
userId,t.activities_id,t.activities_id activitiesId,t.type_cd,t.type_cd
- typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
+ typeCd,
+ <if test="activitiesId !=null and activitiesId != ''">
+ t.context,
+ </if>
+ t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time
createTime
from activities t
--
Gitblit v1.8.0