作者 yangfu

Merge branch 'dev' into test

@@ -2,6 +2,7 @@ package article @@ -2,6 +2,7 @@ package article
2 2
3 import ( 3 import (
4 "context" 4 "context"
  5 + "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/core"
5 6
6 "github.com/samber/lo" 7 "github.com/samber/lo"
7 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain" 8 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
@@ -98,10 +99,13 @@ func (l *SystemGetArticleLogic) SystemGetArticle(req *types.SystemArticleGetRequ @@ -98,10 +99,13 @@ func (l *SystemGetArticleLogic) SystemGetArticle(req *types.SystemArticleGetRequ
98 } 99 }
99 lo.ForEach(articleSections, func(item *domain.ArticleSection, index int) { 100 lo.ForEach(articleSections, func(item *domain.ArticleSection, index int) {
100 resp.Section = append(resp.Section, types.ArticleSection{ 101 resp.Section = append(resp.Section, types.ArticleSection{
101 - Id: item.Id,  
102 - Content: item.Content,  
103 - SortBy: item.SortBy,  
104 - TotalComment: item.TotalComment, 102 + Id: item.Id,
  103 + Content: item.Content,
  104 + SortBy: item.SortBy,
  105 + TotalComment: item.TotalComment,
  106 + Images: item.Images,
  107 + ParagraphTemplate: core.NewTypesParagraph(item.ParagraphTemplate),
  108 + ParagraphType: item.ParagraphType,
105 }) 109 })
106 }) 110 })
107 userIds := lo.Union(resp.WhoRead, resp.WhoReview) 111 userIds := lo.Union(resp.WhoRead, resp.WhoReview)