文章列表核心观点展示样式处理

services/article.go

@@ -118,8 +118,8 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 	for k, v := range list {
 		item := list[k]
 		//如果文章一开始的内容是图片，优先展示第一张图片
-		newBody, _ := GetReportContentTextSubByarticle(item.Body, item.Annotation, item.ArticleId)
-		list[k].Annotation = newBody
+		//newBody, _ := GetReportContentTextSubByarticle(item.Body, item.Annotation, item.ArticleId)
+		list[k].Annotation = ArticleAnnotation(item)
 		list[k].Body = ""
 		list[k].Abstract, _ = GetReportContentTextSub(v.Abstract)
 		list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
@@ -273,7 +273,6 @@ func GetSpecialArticleDetailUserPower(user *models.WxUserItem, articleInfo *mode
 		err = errors.New("GetdetailByCategoryIdP,获取详情失败, Err: ")
 		return
 	}
-	fmt.Println(permissionStr)
 	//如果没有对应的升级权限，则返回
 	if !strings.Contains(permissionStr, reportMapDetail.ChartPermissionName) {
 		return
@@ -282,3 +281,9 @@ func GetSpecialArticleDetailUserPower(user *models.WxUserItem, articleInfo *mode
 	}
 	return
 }
+
+//处理核心观点的展示规则
+func ArticleAnnotation(item *models.ArticleListResp) (annotation string) {
+	annotation = strings.Replace(item.Annotation, "<br>", "", -1)
+	return
+}

services/resource_data.go

@@ -101,11 +101,11 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 
-		//articleList, e = HandleArticleCategoryImg(articleList)
-		//if e != nil {
-		//	err = errors.New("HandleArticleCategoryImg, Err: " + e.Error())
-		//	return
-		//}
+		articleList, e = HandleArticleCategoryImg(articleList)
+		if e != nil {
+			err = errors.New("HandleArticleCategoryImg, Err: " + e.Error())
+			return
+		}
 		for _, v := range articleList {
 			mapItems[fmt.Sprint("article", v.ArticleId)].Title = v.Title
 			mapItems[fmt.Sprint("article", v.ArticleId)].Annotation = v.Annotation