Merge branch 'cygx_12.4' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/micro_roadshow.go

@@ -343,14 +343,14 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列； 3-调研反馈   多个用 , 隔开"
 		videoMico += ` AND a.chart_permission_id  = 0 ` // 产业视频不在搜索范围内
 		if strings.Contains(searchType, "1") && !strings.Contains(searchType, "3") {
-			audioAct += ` AND b.activity_type_id IN (2,7)  AND b.is_yidong_conduct = 1 `
-			videoAct += ` AND b.activity_type_id IN (2,7)  AND b.is_yidong_conduct = 1 `
+			audioAct += ` AND a.file_type = 1 `
+			videoAct += ` AND a.file_type = 1 `
 		}
 
 		if !strings.Contains(searchType, "1") && strings.Contains(searchType, "3") {
 
-			audioAct += ` AND  (    b.is_yidong_conduct = 0   OR 	b.activity_type_id   NOT  IN (2,7) )  `
-			videoAct += ` AND  (     b.is_yidong_conduct = 0  OR 	b.activity_type_id   NOT  IN (2,7) )  `
+			audioAct += ` AND  a.file_type = 2 `
+			videoAct += ` AND  a.file_type = 2 `
 		}
 
 		if !strings.Contains(searchType, "2") {