Merge branch 'CRM6.0'

models/roadshow/calendar.go

@@ -25,7 +25,7 @@ type RsCalendarResearcher struct {
 }
 
 func GetRsCalendarResearcher(endDate, endTime string) (list []*RsCalendarResearcher, err error) {
-	sql := `SELECT * FROM rs_calendar_researcher WHERE status<>6 AND end_date=? AND end_time<=? `
+	sql := `SELECT * FROM rs_calendar_researcher WHERE status=1 AND status<>6 AND end_date=? AND end_time<=? `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, endDate, endTime).QueryRows(&list)
 	return