Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/report.go

@@ -2056,6 +2056,10 @@ func (this *CalendarController) ResearcherReportExport() {
 		pars = append(pars, endDate)
 	}
 
+	condition += ` AND b.activity_type = ‘路演’ `
+	condition += ` AND b.roadshow_type <>'' `
+	condition += ` AND c.question_status = 1 `
+
 	list, err := roadshow.GetReportResearcherExport(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败！"