Merge branch 'cygx/mfyx_3.6' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity_video.go

@@ -401,20 +401,37 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
 			br.ErrMsg = "活动ID错误，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
 			return
 		}
-		//key := utils.MicroRoadshowDefaultImgKey
-		if fileType == 1 {
-			for _, v := range list.Audio {
-				if v.ChartPermissionId == activityInfo.ChartPermissionId {
-					resp.List = v.List
+
+		if activityInfo.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN { // 研选的音视频看全部行业
+			if fileType == 1 {
+				for _, v := range list.Audio {
+					for _, vFile := range v.List {
+						resp.List = append(resp.List, vFile)
+					}
+				}
+			} else {
+				for _, v := range list.Video {
+					for _, vFile := range v.List {
+						resp.List = append(resp.List, vFile)
+					}
 				}
 			}
 		} else {
-			for _, v := range list.Video {
-				if v.ChartPermissionId == activityInfo.ChartPermissionId {
-					resp.List = v.List
+			if fileType == 1 {
+				for _, v := range list.Audio {
+					if v.ChartPermissionId == activityInfo.ChartPermissionId {
+						resp.List = v.List
+					}
+				}
+			} else {
+				for _, v := range list.Video {
+					if v.ChartPermissionId == activityInfo.ChartPermissionId {
+						resp.List = v.List
+					}
 				}
 			}
 		}
+		//key := utils.MicroRoadshowDefaultImgKey
 	}
 
 	br.Ret = 200