Merge remote-tracking branch 'origin/feature/五月需求迭代' into feature/五月需求迭代

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -170,8 +170,9 @@
   	  	<if test="null != searchParams">
   	  		and b.name like #{searchParams}
   	  	</if>
+  	  	and b.end_time > now() 
   	  	group by b.plan_id
-  	  	
+  	  	having notSendCount 
   	  	order by b.end_time desc ,  a.create_time desc
   </select>