|
@@ -564,23 +564,25 @@ func (this *UserController) CollectList() {
|
|
|
for i := 0; i < lenList; i++ {
|
|
|
item := list[i]
|
|
|
article := articleMap[item.ArticleId]
|
|
|
- list[i].Title = article.Title
|
|
|
- list[i].DepartmentId = article.DepartmentId
|
|
|
- list[i].NickName = article.NickName
|
|
|
- list[i].PublishDate = article.PublishDate
|
|
|
- if article.ArticleTypeId == 0 {
|
|
|
- list[i].Source = 1
|
|
|
- } else {
|
|
|
- list[i].Source = 2
|
|
|
- list[i].IsResearch = true
|
|
|
- }
|
|
|
- if mapArticleCollectNum[article.ArticleId] != nil {
|
|
|
- list[i].CollectNum = mapArticleCollectNum[article.ArticleId].CollectNum
|
|
|
- list[i].Pv = mapArticleCollectNum[article.ArticleId].Pv
|
|
|
- list[i].IsCollect = mapArticleCollectNum[article.ArticleId].IsCollect
|
|
|
- }
|
|
|
- if _, ok := lyjhTypeMap[item.CategoryId]; ok && list[i].ArticleId >= utils.SummaryArticleId {
|
|
|
- list[i].IsRoadShow = true
|
|
|
+ if list[i].IsSpecial != 1 {
|
|
|
+ list[i].Title = article.Title
|
|
|
+ list[i].DepartmentId = article.DepartmentId
|
|
|
+ list[i].NickName = article.NickName
|
|
|
+ list[i].PublishDate = article.PublishDate
|
|
|
+ if article.ArticleTypeId == 0 {
|
|
|
+ list[i].Source = 1
|
|
|
+ } else {
|
|
|
+ list[i].Source = 2
|
|
|
+ list[i].IsResearch = true
|
|
|
+ }
|
|
|
+ if mapArticleCollectNum[article.ArticleId] != nil {
|
|
|
+ list[i].CollectNum = mapArticleCollectNum[article.ArticleId].CollectNum
|
|
|
+ list[i].Pv = mapArticleCollectNum[article.ArticleId].Pv
|
|
|
+ list[i].IsCollect = mapArticleCollectNum[article.ArticleId].IsCollect
|
|
|
+ }
|
|
|
+ if _, ok := lyjhTypeMap[item.CategoryId]; ok && list[i].ArticleId >= utils.SummaryArticleId {
|
|
|
+ list[i].IsRoadShow = true
|
|
|
+ }
|
|
|
}
|
|
|
if item.ArticleTypeId == -1 {
|
|
|
list[i].ArticleTypeName = utils.CYGX_YANXUAN_SPECIAL
|