Browse Source

no message

xingzai 7 months ago
parent
commit
15715a33f2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      controllers/roadshow/calendar.go

+ 2 - 2
controllers/roadshow/calendar.go

@@ -2045,7 +2045,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  <=  ? ) )  `
@@ -2193,7 +2193,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  <=  ? ) )  `