作者 tangxvhui

修复 bug 4440,详情中作者信息取最新的

@@ -30,7 +30,10 @@ func NewMiniGetArticleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mi @@ -30,7 +30,10 @@ func NewMiniGetArticleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mi
30 func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (resp *types.MiniArticleGetResponse, err error) { 30 func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (resp *types.MiniArticleGetResponse, err error) {
31 // 获取文章内容 31 // 获取文章内容
32 var conn = l.svcCtx.DefaultDBConn() 32 var conn = l.svcCtx.DefaultDBConn()
33 - 33 + companyInfo, err := l.svcCtx.CompanyRepository.FindOne(l.ctx, conn, req.CompanyId)
  34 + if err != nil {
  35 + return nil, xerr.NewErrMsgErr("读取公司数据失败", err)
  36 + }
34 articleInfo, err := l.svcCtx.ArticleRepository.FindOne(l.ctx, conn, req.Id) 37 articleInfo, err := l.svcCtx.ArticleRepository.FindOne(l.ctx, conn, req.Id)
35 if err != nil { 38 if err != nil {
36 return nil, xerr.NewErrMsgErr("读取文章内容失败", err) 39 return nil, xerr.NewErrMsgErr("读取文章内容失败", err)
@@ -66,6 +69,7 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) ( @@ -66,6 +69,7 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
66 } 69 }
67 return resp, nil 70 return resp, nil
68 } 71 }
  72 +
69 queryOption := domain.NewQueryOptions(). 73 queryOption := domain.NewQueryOptions().
70 WithFindOnly(). 74 WithFindOnly().
71 MustWithKV("articleId", articleInfo.Id) 75 MustWithKV("articleId", articleInfo.Id)
@@ -74,6 +78,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) ( @@ -74,6 +78,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
74 if err != nil { 78 if err != nil {
75 return nil, xerr.NewErrMsgErr("读取文章内容失败", err) 79 return nil, xerr.NewErrMsgErr("读取文章内容失败", err)
76 } 80 }
  81 +
  82 + //获取作者信息
  83 + author, _ := l.svcCtx.UserRepository.FindOne(l.ctx, conn, int64(req.UserId))
  84 +
77 var meLoveFlag int 85 var meLoveFlag int
78 if req.UserId > 0 { 86 if req.UserId > 0 {
79 // 获取我对文章的点赞标识 87 // 获取我对文章的点赞标识
@@ -120,10 +128,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) ( @@ -120,10 +128,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
120 AuthorId: articleInfo.AuthorId, 128 AuthorId: articleInfo.AuthorId,
121 Author: types.ArticleAuthor{ 129 Author: types.ArticleAuthor{
122 Id: articleInfo.Author.Id, 130 Id: articleInfo.Author.Id,
123 - Name: articleInfo.Author.Name,  
124 - Avatar: articleInfo.Author.Avatar,  
125 - Position: articleInfo.Author.Position,  
126 - Company: articleInfo.Author.Company, 131 + Name: "",
  132 + Avatar: "",
  133 + Position: "",
  134 + Company: companyInfo.Name,
127 }, 135 },
128 CreatedAt: articleInfo.CreatedAt, 136 CreatedAt: articleInfo.CreatedAt,
129 Section: articleSection, 137 Section: articleSection,
@@ -148,7 +156,15 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) ( @@ -148,7 +156,15 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
148 if len(backupList) > 0 { 156 if len(backupList) > 0 {
149 resp.Edit = 1 157 resp.Edit = 1
150 } 158 }
151 - 159 + if author != nil {
  160 + resp.Author = types.ArticleAuthor{
  161 + Id: articleInfo.Author.Id,
  162 + Name: author.Name,
  163 + Avatar: author.Avatar,
  164 + Position: author.Position,
  165 + Company: companyInfo.Name,
  166 + }
  167 + }
152 for k, v := range articleInfo.MatchUrl { 168 for k, v := range articleInfo.MatchUrl {
153 resp.MatchUrl[k] = v 169 resp.MatchUrl[k] = v
154 } 170 }