Roc 2 роки тому
батько
коміт
e9af6b357b
1 змінених файлів з 1 додано та 1 видалено
  1. 1 1
      models/roadshow/public_meeting.go

+ 1 - 1
models/roadshow/public_meeting.go

@@ -47,7 +47,7 @@ func GetCoincideMeeting(startTime, endTime string) (list []*PublicMeetingView, e
 			SELECT a.rs_calendar_id,MIN(DATE_FORMAT(CONCAT(b.start_date," ",b.start_time),'%Y-%m-%d %H:%i:%S')) AS min_time,MAX(DATE_FORMAT(CONCAT(b.end_date," ",b.end_time),'%Y-%m-%d %H:%i:%S')) AS max_time
 						FROM rs_calendar AS a
 						INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-						WHERE a.source=0 AND activity_type='公开会议' AND status in (1,2)
+						WHERE a.source=0 AND activity_type='公开会议' AND b.status in (1,2)
 						GROUP BY a.rs_calendar_id
 			) AS t
 			WHERE (t.min_time<=? AND t.max_time>=?) OR (?>=t.min_time AND ?<=t.max_time) or