Merge branch 'crm/crm_17.0_ficc' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/roadshow/calendar_check.go

@@ -99,21 +99,6 @@ func CheckActivity(startDateTime, endDateTime, status string, sellerId int) (cal
 	activityPars = append(activityPars, endDateTime)
 	activityPars = append(activityPars, endDateTime)
 	calendarCount, err = roadshow.CheckCalendarActivitySellerrCount(activityCondition, activityPars)
-	if calendarCount <= 0 {
-		var researcherCondition string
-		var researcherMatterPars []interface{}
-
-		researcherCondition += " AND b.sys_user_id = ? "
-		researcherMatterPars = append(researcherMatterPars, sellerId)
-
-		researcherCondition += " AND a.status IN (" + status + ") "
-
-		researcherCondition += ` AND ? <=DATE_FORMAT(CONCAT(a.start_date," ",a.start_time),'%Y-%m-%d %H:%i:%S')
-								 AND ? >= DATE_FORMAT(CONCAT(a.end_date," ",a.end_time),'%Y-%m-%d %H:%i:%S') `
-		researcherMatterPars = append(researcherMatterPars, startDateTime)
-		researcherMatterPars = append(researcherMatterPars, endDateTime)
-		calendarCount, err = roadshow.CheckCalendarSellerCount(researcherCondition, researcherMatterPars)
-	}
 	return
 }