Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_12.8

models/report.go

@@ -632,11 +632,10 @@ func GetArticleAndYxSpecialList(condition, conditionSpecial string, userId int)
 			( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id AND user_id = ? ) AS my_collect_num,
 			a.type AS special_type,
 			a.user_id AS user_id,
-			c.create_time AS create_time 
+			a.create_time AS create_time 
 		FROM
 			cygx_yanxuan_special AS a
 			JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
-			JOIN cygx_yanxuan_special_collect AS c ON a.id = c.yanxuan_special_id 
 		WHERE
 			1 = 1 
 			AND a.STATUS = 3 ` + conditionSpecial + ` ORDER BY publish_date DESC  LIMIT 30`

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") {

services/resource_data.go

@@ -452,7 +452,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.ReportSelection == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil {
 				continue
 			}
-			if v.SourceId == vList.SourceId {
+			if v.SourceId == vList.SourceId && v.Source == vList.Source {
 				items = append(items, v)
 			}
 		}