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

models/micro_roadshow.go

@@ -195,7 +195,7 @@ func GetMicroRoadShowVideoPageListV12(startSize, pageSize int, audioAct string,
 	    	b.activity_time as publish_time,
 			b.chart_permission_id,
 			b.chart_permission_name,
-			"" AS play_seconds,
+			a.video_duration AS play_seconds,
 			a.background_img,
 			"" AS industry_name,
 			0 AS  industry_id,

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)
 			}
 		}