fix

controllers/user.go

@@ -926,7 +926,7 @@ func (this *UserController) CollectList() {
 	for i := 0; i < lenList; i++ {
 		item := list[i]
 		article := articleMap[item.ArticleId]
-		if list[i].IsSpecial != 1 {
+		if list[i].IsSpecialInt != 1 {
 			list[i].Title = article.Title
 			list[i].DepartmentId = article.DepartmentId
 			list[i].NickName = article.NickName
@@ -942,6 +942,20 @@ func (this *UserController) CollectList() {
 				list[i].Pv = mapArticleCollectNum[article.ArticleId].Pv
 				list[i].IsCollect = mapArticleCollectNum[article.ArticleId].IsCollect
 			}
+		} else {
+			//处理研选专栏
+			list[i].IsSpecial = true
+			if list[i].CompanyTagsStr != "" {
+				list[i].CompanyTags = strings.Split(list[i].CompanyTagsStr, ",")
+			} else {
+				list[i].CompanyTags = []string{}
+			}
+			if list[i].IndustryTagStr != "" {
+				list[i].IndustryTags = strings.Split(list[i].IndustryTagStr, ",")
+			} else {
+				list[i].IndustryTags = []string{}
+			}
+			list[i].IsResearch = true
 		}
 		if item.ArticleTypeId == -1 {
 			list[i].ArticleTypeName = utils.CYGX_YANXUAN_SPECIAL

models/report.go

@@ -783,24 +783,29 @@ func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []
 
 // 报告榜单start
 type ArticleReportBillboardResp struct {
-	ArticleId       int    `description:"文章id"`
-	Title           string `description:"标题"`
-	PublishDate     string `description:"发布时间"`
-	PermissionName  string `description:"行业名称"`
-	DepartmentId    int    `description:"作者Id"`
-	NickName        string `description:"作者昵称"`
-	IsCollect       bool   `description:"本人是否收藏"`
-	Pv              int    `description:"PV"`
-	CollectNum      int    `description:"收藏人数"`
-	Source          int    `description:"来源 1:弘则资源包（报告）、2：研选主题（报告）"`
-	ArticleTypeId   int    `description:"文章类型ID判断是否是研选使用"`
-	IsResearch      bool   `description:"是否属于研选"`
-	ArticleTypeName string `description:"文章类型名称"`
-	IsSpecial       int    `description:"是否为研选专栏"`
-	SpecialTags     string `description:"研选专栏标签"`
-	MyCollectNum    int    `description:"本人是否收藏"`
-	SpecialType     int    `description:"专栏类型 1:笔记，2:观点"`
-	UserId          int    `description:"作者id"`
+	ArticleId       int      `description:"文章id"`
+	Title           string   `description:"标题"`
+	PublishDate     string   `description:"发布时间"`
+	PermissionName  string   `description:"行业名称"`
+	DepartmentId    int      `description:"作者Id"`
+	NickName        string   `description:"作者昵称"`
+	IsCollect       bool     `description:"本人是否收藏"`
+	Pv              int      `description:"PV"`
+	CollectNum      int      `description:"收藏人数"`
+	Source          int      `description:"来源 1:弘则资源包（报告）、2：研选主题（报告）"`
+	ArticleTypeId   int      `description:"文章类型ID判断是否是研选使用"`
+	IsResearch      bool     `description:"是否属于研选"`
+	ArticleTypeName string   `description:"文章类型名称"`
+	IsSpecial       bool     `description:"是否为研选专栏"`
+	IsSpecialInt    int      `description:"是否为研选专栏"`
+	SpecialTags     string   `description:"研选专栏标签"`
+	MyCollectNum    int      `description:"本人是否收藏"`
+	SpecialType     int      `description:"专栏类型 1:笔记，2:观点"`
+	UserId          int      `description:"作者id"`
+	IndustryTagStr  string   `description:"研选专栏行业标签"`
+	CompanyTagsStr  string   `description:"研选专栏公司标签"`
+	IndustryTags    []string `description:"研选专栏行业标签"`
+	CompanyTags     []string `description:"研选专栏公司标签"`
 	List            []*IndustrialManagementIdInt
 }
 

models/user.go

@@ -383,13 +383,15 @@ func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*Articl
 		'' AS nick_name,
 		0 AS article_type_id,
 		'' AS article_type_name,
-		0 AS is_special,
+		0 AS is_special_int,
 		'' AS special_tags,
 		0 AS pv,
 		0 AS collect_num,
 		0 AS my_collect_num,
 		0 AS special_type,
 		a.user_id AS user_id,
+		'' AS company_tag_str, 
+		'' AS industry_tag_str, 
 		a.create_time AS create_time 
 			FROM cygx_article_collect AS a 
 			INNER JOIN cygx_article as art ON art.article_id = a.article_id
@@ -403,13 +405,15 @@ func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*Articl
 		b.nick_name AS nick_name,
 		-1 AS article_type_id,
 		'' AS article_type_name,
-		1 AS is_special,
+		1 AS is_special_int,
 		a.tags AS special_tags,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_record AS h WHERE h.yanxuan_special_id = a.id ) AS pv,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.yanxuan_special_id = a.id  ) AS collect_num,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id  AND user_id = ? ) AS my_collect_num,
 		a.type AS special_type,
 		a.user_id AS user_id,
+		a.company_tags AS company_tag_str, 
+		a.industry_tags AS industry_tags_str, 
 		c.create_time AS create_time 
 	FROM
 	cygx_yanxuan_special AS a