Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

controllers/roadshow/calendar.go

@@ -2017,7 +2017,7 @@ func (this *CalendarController) ResearcherCalendarDetail() {
 	//pars = append(pars, endDate)
 
 	//解决研究员休假，产生跨周的数据查询不到的bug，
-	condition += `AND ( b.start_date >= ? AND b.end_date <= ? 
+	condition += ` AND ( b.start_date >= ? AND b.end_date <= ? 
 						OR ( b.start_date >= ?  AND  b.start_date <= ? )
 						OR ( b.start_date <= ?  AND  b.end_date  >=  ? ) 
 						OR ( b.end_date >= ?    AND  b.end_date  <=  ? ) )  `
@@ -2165,7 +2165,7 @@ func (this *CalendarController) MyCalendarDetail() {
 	//pars = append(pars, endDate)
 
 	//解决研究员休假，产生跨周的数据查询不到的bug，
-	condition += `AND ( b.start_date >= ? AND b.end_date <= ? 
+	condition += ` AND ( b.start_date >= ? AND b.end_date <= ? 
 						OR ( b.start_date >= ?  AND  b.start_date <= ? )
 						OR ( b.start_date <= ?  AND  b.end_date  >=  ? ) 
 						OR ( b.end_date >= ?    AND  b.end_date  <=  ? ) )  `