no message

controllers/research.go

@@ -767,12 +767,24 @@ func (this *ResearchController) ArticleNewList() {
 		return
 	}
 	var articleIds []int
+	//var articleIdsArr []int
+	var articleIdsSpecialArr []int // 研选专栏ID
 	for k, v := range list {
 		if v.MyCollectNum > 0 {
 			list[k].IsCollect = true
 		}
-		articleIds = append(articleIds, v.ArticleId)
+		if v.IsSpecial == 1 {
+			articleIdsSpecialArr = append(articleIdsSpecialArr, v.ArticleId)
+		} else {
+			articleIds = append(articleIds, v.ArticleId)
+		}
 	}
+
+	articleMapPv := services.GetArticleHistoryByArticleId(articleIds)                       //文章Pv
+	articleCollectMap, _ := services.GetCygxArticleCollectMap(user.UserId)                  //用户收藏的文章
+	articleCollectNumMap, _ := services.GetCygxArticleCollectNumMapByArtcileIds(articleIds) //文章收藏的数量
+	articleCollectYanxuanSpecialMap, _ := services.GetYanxuanSpecialCollectMap(user.UserId) //用户收藏的研选专栏
+
 	//处理关联的产业
 	industrialMap, err := services.GetArticleIndustrialByArticleId(articleIds)
 	if err != nil {
@@ -781,6 +793,13 @@ func (this *ResearchController) ArticleNewList() {
 		return
 	}
 	for k, v := range list {
+		if v.IsSpecial == 1 {
+			v.IsCollect = articleCollectYanxuanSpecialMap[v.ArticleId]
+		} else {
+			v.Pv = articleMapPv[v.ArticleId]
+			v.CollectNum = articleCollectNumMap[v.ArticleId]
+			v.IsCollect = articleCollectMap[v.ArticleId]
+		}
 		if len(industrialMap[v.ArticleId]) > 0 {
 			list[k].List = industrialMap[v.ArticleId]
 		} else {

models/report.go

@@ -812,6 +812,8 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 			d.nick_name,
 			d.department_id,
 			0 AS is_special,
+			0 as pv,
+			0 as collect_num,
 			0 AS special_type,
 			0 AS user_id,
 			'' AS company_tags, 
@@ -836,6 +838,8 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 		b.nick_name AS nick_name,
 		a.user_id AS department_id,
 		1 AS is_special,
+		a.pv,
+		a.article_collect_num as collect_num,
 		a.type AS special_type,
 		a.user_id AS user_id,
 		a.company_tags AS company_tags,