Merge remote-tracking branch 'origin/feature-canvas' into feature-canvas

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

@@ -214,10 +214,10 @@
   	  		and b.name like #{searchParams}
   	  	</if>
 	  <if test="1==clerkTaskStatus">
-		  and b.end_time > now()
+		  and b.end_time > now() and a.send_status =1
 	  </if>
 	  <if test="2==clerkTaskStatus">
-		  and b.end_time <![CDATA[<=]]> now()
+		  and ( b.end_time <![CDATA[<=]]> now() or a.send_status !=1 )
 	  </if>
 	  group by b.plan_id
 	  order by b.end_time desc ,  a.create_time desc
@@ -329,7 +329,7 @@
 		  <if test="null != clerkId">
 			  AND a.clerk_id = #{clerkId}
 		  </if>
-		  and b.end_time <![CDATA[<=]]> now()
+		  and b.end_time <![CDATA[ > ]]> now()
 		   AND a.send_status = 1 and a.delete_flag = 0
 	</select>