no message

controllers/roadshow/calendar.go

@@ -2305,11 +2305,14 @@ func (this *CalendarController) ResearcherCalendarDetail() {
 	//go roadshowService.SyncCalendarFromShanghai(researcherInfo.Mobile, startDate, endDate)
 	go roadshowService.InsertSyncCalendarFromShanghaiLPush(researcherInfo.Mobile, startDate, endDate)
 
-	condition += ` AND b.start_date>=?`
-	pars = append(pars, startDate)
-	condition += ` AND b.end_date<=?`
-	pars = append(pars, endDate)
-
+	//condition += ` AND b.start_date>=?`
+	//pars = append(pars, startDate)
+	//condition += ` AND b.end_date<=?`
+	//pars = append(pars, endDate)
+
+	//解决研究员休假，产生跨周的数据查询不到的bug，
+	condition += ` AND (b.start_date >= ? 	AND b.end_date <= ?  OR  (b.start_date >= ?  AND  b.start_date <= ? AND   b.end_date  >= ? ) ) `
+	pars = append(pars, startDate, endDate, startDate, endDate, endDate)
 	condition += ` AND b.status IN(2) `
 	//pars = append(pars, 2)