no message

controllers/home.go

@@ -678,7 +678,7 @@ func (this *HomeController) NewList() {
 	var total int
 	resp := new(models.HomeResourceDataListResp)
 
-	//condition += " AND source = 'activityvoice' "
+	//condition += " AND source = 'article' "
 
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {

models/activity.go

@@ -1061,7 +1061,7 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 		tempCondition = strings.TrimRight(tempCondition, ",")
 		sql = `SELECT * FROM(` + sql + `) AS t WHERE t.activity_type_name IN (` + tempCondition + `)`
 	}
-	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, uid, uid, uid, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 

models/chart.go

@@ -232,7 +232,8 @@ func GetChartListCollectionNew(condition string, pars []interface{}, userId, sta
 			LEFT JOIN cygx_chart_top AS t ON t.chart_id = a.chart_id
 			LEFT JOIN cygx_chart_collect AS c ON c.chart_id = a.chart_id 
 		WHERE
-			a.publish_status = 1 ` + condition + `
+ 1=1
+			` + condition + `
 			
 		GROUP BY
 			a.chart_id 

models/resource_data.go

@@ -18,43 +18,21 @@ type CygxResourceData struct {
 }
 
 type CygxResourceDataResp struct {
-	Id                      int    `orm:"column(id);pk"`
-	SourceId                int    `description:"资源ID"`
-	Source                  string `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
-	Title                   string `description:"标题"`
-	Annotation              string `description:"核心观点"`
-	PublishDate             string `description:"发布时间"`
-	Abstract                string `description:"摘要"`
-	IsTop                   bool   `description:"是否置顶"`
-	IsCollection            bool   `description:"是否收藏 "`
-	BackgroundImg           string `description:"背景图"`
-	City                    string `description:"城市"`
-	IsSignup                int    `description:"是否已报名 1是 ，0 否"`
-	IsAppointment           int    `description:"是否已预约纪要 1是 ，0 否"`
-	IsCancelMeetingReminder int    `description:"是否添加了消息消息提醒   1是 ，0 否"`
-	ActiveState             string `description:"活动进行状态 未开始：1、进行中2、已结束3"`
-	ImgUrl                  string `description:"行业图片链接"`
-	ImgUrlText              string `description:"活动类型图片链接"`
-	ActivityType            int    `description:"活动线上线下类型 1线上，0 线下，2线下"`
-	IsShowOutboundCall      bool   `description:"是否展示预约外呼"`
-	IsShowMeetingReminder   bool   `description:"是否展示会议提醒"`
-	IsShowHelpSsk           bool   `description:"是否展示帮我带问"`
-	IsShowSignup            bool   `description:"是否展示我要报名"`
-	IsShowAppointment       bool   `description:"是否展示预约纪要"`
-	IsShowDetails           bool   `description:"是否展示查看详情按钮"`
-	YidongActivityUrl       string `description:"易董活动跳转地址"`
-	TripStatus              int    `description:"行程进行状态 1：预报名，2：确定行程"`
-	IsTrip                  int    `description:"确定行程是否报名 1是 ，0 否"`
-	ActivityTimeText        string `description:"活动预期时间带文字"`
-	TripImgLink             string `description:"行程图片链接"`
-	ChartPermissionId       int    `description:"权限id"`
-	Expert                  string `description:"专家"`
-	Speaker                 string `description:"主讲人"`
-	ActivityTime            string `description:"活动预期时间"`
-	ResourceUrl             string `description:"链接"`
-	AuthInfo                *UserPermissionAuthInfo
+	Id              int                        `orm:"column(id);pk"`
+	SourceId        int                        `description:"资源ID"`
+	Source          string                     `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	PublishDate     string                     `description:"发布时间"`
+	Article         *HomeArticle               `description:"文章"`
+	Newchart        *HomeChartListResp         `description:"图表"`
+	Roadshow        *MicroRoadShowPageList     `description:"微路演"`
+	Activity        *ActivityDetail            `description:"活动"`
+	Activityvideo   *MicroRoadShowPageList     `description:"活动视频"`
+	Activityvoice   *MicroRoadShowPageList     `description:"活动音频"`
+	Activityspecial *CygxActivitySpecialDetail `description:"专项调研活动"`
 }
 
+//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+
 type HomeResourceDataListResp struct {
 	Paging *paging.PagingItem
 	List   []*CygxResourceDataResp `description:"列表"`

services/resource_data.go

@@ -25,19 +25,16 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		item.Id = v.Id
 		item.SourceId = v.SourceId
 		item.Source = v.Source
-		item.Title = v.Title
-		item.Annotation = v.Annotation
-		item.Abstract = v.Abstract
-		item.PublishDate = utils.TimeRemoveHms(v.PublishDate)
+		item.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
 		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
 	}
 
 	var articleIds []int
 	var newchartIds []int
-	var roadshowIds []int
+	var roadshowIds []string
 	var activityIds []int
-	var activityvideoIds []int
-	var activityvoiceIds []int
+	var activityvideoIds []string
+	var activityvoiceIds []string
 	var activityspecialIds []int
 	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
 	for _, v := range list {
@@ -46,18 +43,35 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		} else if v.Source == "newchart" {
 			newchartIds = append(newchartIds, v.SourceId)
 		} else if v.Source == "roadshow" {
-			roadshowIds = append(roadshowIds, v.SourceId)
+			roadshowIds = append(roadshowIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activity" {
 			activityIds = append(activityIds, v.SourceId)
 		} else if v.Source == "activityvideo" {
-			activityvideoIds = append(activityvideoIds, v.SourceId)
+			activityvideoIds = append(activityvideoIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityvoice" {
-			activityvoiceIds = append(activityvoiceIds, v.SourceId)
+			activityvoiceIds = append(activityvoiceIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityspecial" {
 			activityspecialIds = append(activityspecialIds, v.SourceId)
 		}
 	}
 
+	//处理活动
+	if len(articleIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND a.article_id IN (` + utils.GetOrmInReplace(len(articleIds)) + `)`
+		pars = append(pars, articleIds)
+
+		listArticle, e := models.GetHomeList(condition, pars, 0, len(articleIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listArticle {
+			v.Body = ""
+			mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
+		}
+	}
+
 	detail, e := models.GetConfigByCode("city_img_url")
 	if e != nil {
 		err = errors.New("GetResourceDataList, Err: " + e.Error())
@@ -98,14 +112,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		pars = make([]interface{}, 0)
 		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)`
 		pars = append(pars, activityIds)
-		activityList, e := models.GetActivityListNew(condition, pars, uid, startSize, len(activityIds), 0, 0, "")
+		activityList, e := models.GetActivityListNew(condition, pars, uid, 0, len(activityIds), 0, 0, "")
 		if e != nil {
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
 		var activityListRersp []*models.ActivityDetail
 		for _, v := range activityList {
-
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
 		}
 		for _, v := range activityListRersp {
@@ -123,28 +136,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 					imgUrlResp = mapChart[v.ChartPermissionName]
 				}
 			}
-
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Title = v.ActivityName
-			mapItems[fmt.Sprint("activity", v.ActivityId)].City = v.City
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsSignup = v.IsSignup
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsCancelMeetingReminder = v.IsCancelMeetingReminder
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsAppointment = v.IsAppointment
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActiveState = v.ActiveState
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrlText = v.ImgUrlText
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityType = v.ActivityType
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowOutboundCall = v.IsShowOutboundCall
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowMeetingReminder = v.IsShowMeetingReminder
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowHelpSsk = v.IsShowHelpSsk
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowSignup = v.IsShowSignup
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowAppointment = v.IsShowAppointment
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowDetails = v.IsShowDetails
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Expert = v.Expert
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Speaker = v.Speaker
-			mapItems[fmt.Sprint("activity", v.ActivityId)].YidongActivityUrl = v.YidongActivityUrl
-			//mapItems[fmt.Sprint("activity", v.ActivityId)].PublishDate = v.ActivityTime
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrl = imgUrlResp
-			//fmt.Println(v)
+			mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
 		}
 	}
 
@@ -153,16 +145,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		pars = make([]interface{}, 0)
 		condition = ` AND a.chart_id IN (` + utils.GetOrmInReplace(len(newchartIds)) + `)`
 		pars = append(pars, newchartIds)
-		chartDateList, e := models.GetChartListCollectionNew(condition, pars, uid, startSize, len(newchartIds))
+		chartDateList, e := models.GetChartListCollectionNew(condition, pars, uid, 0, len(newchartIds))
 		if e != nil {
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
 		for _, v := range chartDateList {
-			mapItems[fmt.Sprint("newchart", v.ChartId)].Title = v.Title
-			mapItems[fmt.Sprint("newchart", v.ChartId)].ImgUrl = v.BodyHtml
-			mapItems[fmt.Sprint("newchart", v.ChartId)].IsTop = v.IsTop
-			//mapItems[fmt.Sprint("newchart", v.ChartId)].PublishDate = v.CreateDate
+			mapItems[fmt.Sprint("newchart", v.ChartId)].Newchart = v
 		}
 	}
 
@@ -171,7 +160,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		pars = make([]interface{}, 0)
 		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityspecialIds)) + `)`
 		pars = append(pars, activityspecialIds)
-		activitySpeciallist, e := models.GetCygxActivitySpecialDetailList(condition, pars, user.UserId, startSize, len(activityspecialIds))
+		activitySpeciallist, e := models.GetCygxActivitySpecialDetailList(condition, pars, user.UserId, 0, len(activityspecialIds))
 		if e != nil {
 			err = errors.New("GetCygxActivitySpecialDetailList, Err: " + e.Error())
 			return
@@ -186,92 +175,75 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 				imgUrlResp = mapChart[v.ChartPermissionName]
 			}
 			if _, ok := UserMap[v.ActivityId]; ok {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsTrip = 1
+				v.IsTrip = 1
 			}
 			if v.Days == 0 {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 1
+				v.TripStatus = 1
+				v.TripImgLink = v.TripImgLink
 			} else {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 2
+				v.TripStatus = 2
+				v.TripImgLink = v.TripImgLinkFix
 			}
 			resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
 			resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
 			if resultTimeStart.After(time.Now()) {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(1)
+				v.ActiveState = 1
 			} else if time.Now().After(resultTimeEnd) {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(3)
+				v.ActiveState = 3
 			} else {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(2)
+				v.ActiveState = 2
 			}
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Title = v.ResearchTheme
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityType = v.SpecialType
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].City = v.City
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTime = v.ActivityTime
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
-			//mapItems[fmt.Sprint("activityspecial", v.ActivityId)].PublishDate = v.ActivityTime
-		}
-	}
+			v.ImgUrl = imgUrlResp
+			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Activityspecial = v
 
-	//处理路演
-	if len(roadshowIds) > 0 {
-		pars = make([]interface{}, 0)
-		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(roadshowIds)) + `)`
-		pars = append(pars, roadshowIds)
-		roadshowVideoList, e := models.GetMicroRoadshowVideoListBycondition(condition, pars, startSize, len(roadshowIds))
-		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
-			return
-		}
-		for _, v := range roadshowVideoList {
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].Title = v.VideoName
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].ImgUrl = v.ImgUrl
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
 		}
 	}
 
-	//处理路活动视频
-	if len(activityvideoIds) > 0 {
-		pars = make([]interface{}, 0)
-		fmt.Println(activityvideoIds)
-		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvideoIds)) + `)`
-		pars = append(pars, activityvideoIds)
-		activityVideoList, e := models.GetActivityVideoList(condition, pars, startSize, len(activityvideoIds))
-		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
-			return
-		}
+	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds) > 0 {
 
-		//// 获取默认图配置
-		_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
-		if e != nil {
-			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
-			return
-		}
-		fmt.Println(activityVideoList, "activityVideoList")
-		fmt.Println(videoMap)
-		for _, v := range activityVideoList {
-			fmt.Println(v)
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
-			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
-		}
-	}
+		audioIdstr := strings.Join(activityvoiceIds, ",")
+		ideoIdsStr := strings.Join(roadshowIds, ",")
+		activityVideoIdsStr := strings.Join(activityvideoIds, ",")
 
-	//处理路活音频
-	if len(activityvoiceIds) > 0 {
-		pars = make([]interface{}, 0)
-		condition = ` AND activity_voice_id IN (` + utils.GetOrmInReplace(len(activityvoiceIds)) + `)`
-		pars = append(pars, activityvoiceIds)
-		activityVoiceList, e := models.GetActivityVoiceList(condition, pars, startSize, len(activityvoiceIds))
+		list, _, e := GetMicroRoadShowMycollect(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds), 0, audioIdstr, ideoIdsStr, activityVideoIdsStr)
 		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
 			return
 		}
 
+		for _, item := range list {
+			if item.Type == 1 {
+				//音频
+				count, e := models.GetVoiceCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetVoiceCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			} else if item.Type == 2 {
+				//活动视频
+				count, e := models.GetActivityVideoCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetActivityVideoCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			} else if item.Type == 3 {
+				//微路演视频
+				count, e := models.GetVideoCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetVideoCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			}
+		}
 		// 用户权限
 		authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 		if e != nil {
@@ -280,12 +252,14 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 
 		// 获取默认图配置
-		audioMap, _, _, _, e := GetMicroRoadShowDefaultImgConfig()
+		audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
 		if e != nil {
 			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
 			return
 		}
-		for i, v := range activityVoiceList {
+		//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+		for i := range list {
+			// 权限
 			au := new(models.UserPermissionAuthInfo)
 			au.SellerName = authInfo.SellerName
 			au.SellerMobile = authInfo.SellerMobile
@@ -293,28 +267,162 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			au.OperationMode = authInfo.OperationMode
 			if au.HasPermission == 1 {
 				// 非宏观权限进一步判断是否有权限
-				if activityVoiceList[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, activityVoiceList[i].ChartPermissionName) {
+				if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
 					au.HasPermission = 2
 				}
 			}
 			// 无权限的弹框提示
 			if au.HasPermission != 1 {
 				if au.OperationMode == UserPermissionOperationModeCall {
-					au.PopupMsg = UserPermissionPopupMsgCallActivity
+					if list[i].Type == 1 {
+						au.PopupMsg = UserPermissionPopupMsgCallActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
+					}
 				} else {
-					au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					if list[i].Type == 1 {
+						au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
+					}
 				}
 			}
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].AuthInfo = au
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].Title = v.VoiceName
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ImgUrl = audioMap[v.ChartPermissionId]
-			if au.HasPermission == 1 {
-				mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ResourceUrl = v.VoiceUrl
+			list[i].AuthInfo = au
+			list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
+			// 默认图
+			if list[i].BackgroundImg == "" {
+				if list[i].Type == 1 {
+					list[i].BackgroundImg = audioMap[list[i].ChartPermissionId]
+				} else {
+					list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
+				}
+			}
+			// 分享图
+			if list[i].ShareImg == "" {
+				if list[i].Type == 1 {
+					list[i].ShareImg = audioShareMap[list[i].ChartPermissionId]
+				} else {
+					list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
+				}
+			}
+		}
+		//Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
+		for _, item := range list {
+			if item.Type == 1 {
+				mapItems[fmt.Sprint("activityvoice", item.Id)].Activityvoice = item
+			} else if item.Type == 2 {
+				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
+			} else if item.Type == 3 {
+				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
 			}
 		}
 	}
-	for _, v := range mapItems {
-		items = append(items, v)
+
+	////处理路演
+	//if len(roadshowIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(roadshowIds)) + `)`
+	//	pars = append(pars, roadshowIds)
+	//	roadshowVideoList, e := models.GetMicroRoadshowVideoListBycondition(condition, pars, startSize, len(roadshowIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//	for _, v := range roadshowVideoList {
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].Title = v.VideoName
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].ImgUrl = v.ImgUrl
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
+	//	}
+	//}
+	//
+	////处理路活动视频
+	//if len(activityvideoIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	fmt.Println(activityvideoIds)
+	//	condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvideoIds)) + `)`
+	//	pars = append(pars, activityvideoIds)
+	//	activityVideoList, e := models.GetActivityVideoList(condition, pars, startSize, len(activityvideoIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	//// 获取默认图配置
+	//	_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
+	//	if e != nil {
+	//		err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
+	//		return
+	//	}
+	//	fmt.Println(activityVideoList, "activityVideoList")
+	//	fmt.Println(videoMap)
+	//	for _, v := range activityVideoList {
+	//		fmt.Println(v)
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
+	//		//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
+	//	}
+	//}
+	//
+	////处理路活音频
+	//if len(activityvoiceIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	condition = ` AND activity_voice_id IN (` + utils.GetOrmInReplace(len(activityvoiceIds)) + `)`
+	//	pars = append(pars, activityvoiceIds)
+	//	activityVoiceList, e := models.GetActivityVoiceList(condition, pars, startSize, len(activityvoiceIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	// 用户权限
+	//	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
+	//	if e != nil {
+	//		err = errors.New("GetUserRaiPermissionInfo, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	// 获取默认图配置
+	//	audioMap, _, _, _, e := GetMicroRoadShowDefaultImgConfig()
+	//	if e != nil {
+	//		err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
+	//		return
+	//	}
+	//	for i, v := range activityVoiceList {
+	//		au := new(models.UserPermissionAuthInfo)
+	//		au.SellerName = authInfo.SellerName
+	//		au.SellerMobile = authInfo.SellerMobile
+	//		au.HasPermission = authInfo.HasPermission
+	//		au.OperationMode = authInfo.OperationMode
+	//		if au.HasPermission == 1 {
+	//			// 非宏观权限进一步判断是否有权限
+	//			if activityVoiceList[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, activityVoiceList[i].ChartPermissionName) {
+	//				au.HasPermission = 2
+	//			}
+	//		}
+	//		// 无权限的弹框提示
+	//		if au.HasPermission != 1 {
+	//			if au.OperationMode == UserPermissionOperationModeCall {
+	//				au.PopupMsg = UserPermissionPopupMsgCallActivity
+	//			} else {
+	//				au.PopupMsg = UserPermissionPopupMsgApplyActivity
+	//			}
+	//		}
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].AuthInfo = au
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].Title = v.VoiceName
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ImgUrl = audioMap[v.ChartPermissionId]
+	//		if au.HasPermission == 1 {
+	//			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ResourceUrl = v.VoiceUrl
+	//		}
+	//	}
+	//}
+	for _, vList := range list {
+		for _, v := range mapItems {
+			if v.SourceId == vList.SourceId {
+				items = append(items, v)
+			}
+		}
 	}
 	return
 }