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

controllers/user.go

@@ -611,11 +611,13 @@ func (this *UserController) CollectList() {
 		}
 		if item.ArticleTypeId == -1 {
 			list[i].ArticleTypeName = utils.CYGX_YANXUAN_SPECIAL
+		} else if item.ArticleTypeId > 0 {
+			list[i].ArticleTypeName = utils.CYGX_YANXUAN_ARTICLE
 		}
 		if item.SpecialType == 1 {
-			list[i].Title = "【笔记】"+list[i].Title
+			list[i].Title = "【笔记】" + list[i].Title
 		} else if list[i].SpecialType == 2 {
-			list[i].Title = "【观点】"+list[i].Title
+			list[i].Title = "【观点】" + list[i].Title
 		}
 		if item.MyCollectNum > 0 {
 			list[i].IsCollect = true

models/user.go

@@ -178,7 +178,7 @@ func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*Articl
 		'' AS title,
 		'' AS publish_date,
 		'' AS nick_name,
-		0 AS article_type_id,
+		article_type_id,
 		'' AS article_type_name,
 		0 AS is_special,
 		'' AS special_tags,

utils/constants.go

@@ -246,4 +246,5 @@ const (
 
 const (
 	CYGX_YANXUAN_SPECIAL = "研选专栏" //用户阅读数据
+	CYGX_YANXUAN_ARTICLE = "买方研选" //用户阅读数据
 )