作者 yangfu

快讯

@@ -29,11 +29,11 @@ func NewMiniUserNewsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mini @@ -29,11 +29,11 @@ func NewMiniUserNewsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mini
29 29
30 func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp *types.MiniUserNewsResposne, err error) { 30 func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp *types.MiniUserNewsResposne, err error) {
31 var ( 31 var (
32 - conn = l.svcCtx.DefaultDBConn()  
33 - user *domain.User  
34 - userToken = contextdata.GetUserTokenFromCtx(l.ctx)  
35 - articles []*domain.Article  
36 - readedArticles = make([]*domain.UserReadArticle, 0) 32 + conn = l.svcCtx.DefaultDBConn()
  33 + user *domain.User
  34 + userToken = contextdata.GetUserTokenFromCtx(l.ctx)
  35 + articles []*domain.Article
  36 + readArticles = make([]*domain.UserReadArticle, 0)
37 ) 37 )
38 if user, err = l.svcCtx.UserRepository.FindOne(l.ctx, conn, userToken.UserId); err != nil { 38 if user, err = l.svcCtx.UserRepository.FindOne(l.ctx, conn, userToken.UserId); err != nil {
39 return nil, xerr.NewErrMsgErr("用户不存在", err) 39 return nil, xerr.NewErrMsgErr("用户不存在", err)
@@ -55,9 +55,9 @@ func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp * @@ -55,9 +55,9 @@ func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp *
55 }) 55 })
56 if len(articleIds) > 0 { 56 if len(articleIds) > 0 {
57 resp.LastArticleId = articleIds[len(articleIds)-1] 57 resp.LastArticleId = articleIds[len(articleIds)-1]
58 - _, readedArticles, _ = l.svcCtx.UserReadArticleRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithKV("articleIds", articleIds)) 58 + _, readArticles, _ = l.svcCtx.UserReadArticleRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithKV("articleIds", articleIds))
59 } 59 }
60 - readArticlesMap := lo.KeyBy(readedArticles, func(item *domain.UserReadArticle) int64 { 60 + readArticlesMap := lo.KeyBy(readArticles, func(item *domain.UserReadArticle) int64 {
61 return item.ArticleId 61 return item.ArticleId
62 }) 62 })
63 lo.ForEach(articles, func(item *domain.Article, index int) { 63 lo.ForEach(articles, func(item *domain.Article, index int) {