Merge branch 'crm_fix_bug_2024-09-20' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -2280,10 +2280,12 @@ 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 <= ? AND   b.end_date  >= ? ) ) `
-	pars = append(pars, startDate, endDate, startDate, endDate, endDate)
+	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  <=  ? ) )  `
+	pars = append(pars, startDate, endDate, startDate, endDate, startDate, endDate, startDate, endDate)
 	condition += ` AND b.status IN(2) `
 	//pars = append(pars, 2)