|
@@ -2309,7 +2309,7 @@ func (this *CalendarController) ResearcherCalendarDetail() {
|
|
|
//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 <= ? )
|
|
|
OR ( b.start_date <= ? AND b.end_date >= ? )
|