Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -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>
			@@ -155,12 +155,10 @@
			<if test="readCount !=null and readCount != ''">
			and t.read_count= #{readCount}
			</if>
			<if test="userName !=null and userName != ''">
			and t.user_name= #{userName}
			<if test="staffName !=null and staffName != ''">
			and t.user_name= #{staffName}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>

			<if test="activitiesId !=null and activitiesId != ''">
			and t.activities_id= #{activitiesId}
			</if>
			@@ -171,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}
			@@ -270,11 +268,8 @@
			<if test="readCount !=null and readCount != ''">
			and t.read_count= #{readCount}
			</if>
			<if test="userName !=null and userName != ''">
			and t.user_name= #{userName}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="staffName !=null and staffName != ''">
			and t.user_name= #{staffName}
			</if>
			<if test="activitiesId !=null and activitiesId != ''">
			and t.activities_id= #{activitiesId}
			@@ -286,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}