Merge branch 'dev' into test

@@ -41,7 +41,7 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 	if articleInfo.CompanyId != req.CompanyId {
 	if articleInfo.CompanyId != req.CompanyId {
 		return nil, xerr.NewErrMsg("没有查看权限")
 		return nil, xerr.NewErrMsg("没有查看权限")
 	}
 	}
-
+	if articleInfo.AuthorId != int64(req.UserId) {
 		if len(articleInfo.WhoRead) > 0 {
 		if len(articleInfo.WhoRead) > 0 {
 			inWhoRead := false
 			inWhoRead := false
 			for _, val := range articleInfo.WhoRead {
 			for _, val := range articleInfo.WhoRead {
@@ -59,7 +59,7 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 				return resp, nil
 				return resp, nil
 			}
 			}
 		}
 		}
-
+	}
 	if articleInfo.Show == domain.ArticleShowDisable {
 	if articleInfo.Show == domain.ArticleShowDisable {
 		// 文章内容不显示
 		// 文章内容不显示
 		resp = &types.MiniArticleGetResponse{
 		resp = &types.MiniArticleGetResponse{

@@ -24,6 +24,7 @@ func NewMiniSearchArticlePageLogic(ctx context.Context, svcCtx *svc.ServiceConte
 		Logger:    logx.WithContext(ctx),
 		Logger:    logx.WithContext(ctx),
 		ctx:       ctx,
 		ctx:       ctx,
 		svcCtx:    svcCtx,
 		svcCtx:    svcCtx,
+		userCache: make(map[int64]*domain.User),
 	}
 	}
 }
 }