|
@@ -246,7 +246,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
|
|
|
}
|
|
|
}
|
|
|
- mapActivityVideoId := make(map[int]int)
|
|
|
+ //mapActivityVideoId := make(map[int]int)
|
|
|
//处理路活动视频
|
|
|
if len(activityvideoIds) > 0 {
|
|
|
pars = make([]interface{}, 0)
|
|
@@ -271,7 +271,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
|
|
|
mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
|
|
|
|
|
|
- mapActivityVideoId[v.VideoId] = v.ActivityId
|
|
|
+ //mapActivityVideoId[v.VideoId] = v.ActivityId
|
|
|
//mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
|
|
|
//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
|
|
|
}
|
|
@@ -333,9 +333,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
for _, v := range mapItems {
|
|
|
|
|
|
if v.SourceId == vList.SourceId {
|
|
|
- if v.Source == "activityvideo" {
|
|
|
- v.SourceId = mapActivityVideoId[v.SourceId]
|
|
|
- }
|
|
|
items = append(items, v)
|
|
|
}
|
|
|
}
|