From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 590707b..5e9fc8d
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -140,9 +140,9 @@
typeCd,t.context,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
- left join activities_type act on t.type_cd = act.type_cd and act.status_cd = '0' and t.community_id = act.community_id
+ left join activities_type act on t.type_cd = act.type_cd and t.community_id = act.community_id
where 1 =1
- and t.status_cd= '0'
+ and t.status_cd= '0' and act.status_cd = '0'
<if test="collectCount !=null and collectCount != ''">
and t.collect_count= #{collectCount}
</if>
@@ -169,10 +169,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null ">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null ">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -281,10 +281,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null ">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null ">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
--
Gitblit v1.8.0