allied-creation / sumifcc-discuss · 提交

转到一个项目

作者 郑周
提交 4d76f95e55ef3c670082dd49284b5cc056639b34 2 个父辈 50cdb6d7 d47888fb

Merge branch 'dev' into test

内嵌 并排对比
正在显示 4 个修改的文件 包含 7 行增加 和 2 行删除
@@ -101,6 +101,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma @@ -101,6 +101,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma
101 if len(companyIds) > 0 { 101 if len(companyIds) > 0 {
102 _, companyList, err := l.svcCtx.CompanyRepository.Find(l.ctx, conn, domain.NewQueryOptions(). 102 _, companyList, err := l.svcCtx.CompanyRepository.Find(l.ctx, conn, domain.NewQueryOptions().
103 WithFindOnly(). 103 WithFindOnly().
  104 + WithKV("companyId", userToken.CompanyId).
104 WithKV("ids", companyIds). 105 WithKV("ids", companyIds).
105 WithKV("limit", len(companyIds))) 106 WithKV("limit", len(companyIds)))
106 if err != nil { 107 if err != nil {
@@ -115,6 +116,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma @@ -115,6 +116,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma
115 if len(userIds) > 0 { 116 if len(userIds) > 0 {
116 _, userList, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions(). 117 _, userList, err := l.svcCtx.UserRepository.Find(l.ctx, conn, domain.NewQueryOptions().
117 WithFindOnly(). 118 WithFindOnly().
  119 + WithKV("companyId", userToken.CompanyId).
118 WithKV("ids", userIds). 120 WithKV("ids", userIds).
119 WithKV("limit", len(userIds))) 121 WithKV("limit", len(userIds)))
120 if err != nil { 122 if err != nil {
@@ -129,6 +131,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma @@ -129,6 +131,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma
129 if len(commentIds) > 0 { 131 if len(commentIds) > 0 {
130 _, commentList, err := l.svcCtx.ArticleCommentRepository.Find(l.ctx, conn, domain.NewQueryOptions(). 132 _, commentList, err := l.svcCtx.ArticleCommentRepository.Find(l.ctx, conn, domain.NewQueryOptions().
131 WithFindOnly(). 133 WithFindOnly().
  134 + WithKV("companyId", userToken.CompanyId).
132 WithKV("ids", commentIds). 135 WithKV("ids", commentIds).
133 WithKV("limit", len(commentIds))) 136 WithKV("limit", len(commentIds)))
134 if err != nil { 137 if err != nil {
@@ -143,6 +146,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma @@ -143,6 +146,7 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageRequest, msgType doma
143 if len(articleIds) > 0 { 146 if len(articleIds) > 0 {
144 _, articleList, err := l.svcCtx.ArticleRepository.Find(l.ctx, conn, userToken.CompanyId, domain.NewQueryOptions(). 147 _, articleList, err := l.svcCtx.ArticleRepository.Find(l.ctx, conn, userToken.CompanyId, domain.NewQueryOptions().
145 WithFindOnly(). 148 WithFindOnly().
  149 + WithKV("companyId", userToken.CompanyId).
146 WithKV("ids", articleIds). 150 WithKV("ids", articleIds).
147 WithKV("limit", len(articleIds))) 151 WithKV("limit", len(articleIds)))
148 if err != nil { 152 if err != nil {
@@ -30,6 +30,7 @@ func (l *MiniSystemLogic) MiniSystem(req *types.MessageRequest) (resp *types.Mes @@ -30,6 +30,7 @@ func (l *MiniSystemLogic) MiniSystem(req *types.MessageRequest) (resp *types.Mes
30 30
31 total, list, err := l.svcCtx.MessageSystemRepository.Find(l.ctx, l.svcCtx.DefaultDBConn(), domain.NewQueryOptions(). 31 total, list, err := l.svcCtx.MessageSystemRepository.Find(l.ctx, l.svcCtx.DefaultDBConn(), domain.NewQueryOptions().
32 WithOffsetLimit(req.Page, req.Size). 32 WithOffsetLimit(req.Page, req.Size).
  33 + WithKV("companyId", userToken.CompanyId).
33 WithKV("recipientId", userToken.UserId)) 34 WithKV("recipientId", userToken.UserId))
34 if err != nil { 35 if err != nil {
35 return nil, err 36 return nil, err
@@ -32,7 +32,7 @@ func (l *MiniMyBeLikedLogic) MiniMyBeLiked(req *types.MiniBeLikedRequest) (resp @@ -32,7 +32,7 @@ func (l *MiniMyBeLikedLogic) MiniMyBeLiked(req *types.MiniBeLikedRequest) (resp
32 32
33 total, list, err := l.svcCtx.UserLoveFlagRepository.Find(l.ctx, conn, domain.NewQueryOptions(). 33 total, list, err := l.svcCtx.UserLoveFlagRepository.Find(l.ctx, conn, domain.NewQueryOptions().
34 WithOffsetLimit(req.Page, req.Size). 34 WithOffsetLimit(req.Page, req.Size).
35 - WithKV("commentId", userToken.CompanyId). 35 + WithKV("companyId", userToken.CompanyId).
36 WithKV("toUserId", userToken.UserId)) 36 WithKV("toUserId", userToken.UserId))
37 if err != nil { 37 if err != nil {
38 return nil, err 38 return nil, err
@@ -32,7 +32,7 @@ func (l *MiniMyLikeLogic) MiniMyLike(req *types.MiniMyLikeRequest) (resp *types. @@ -32,7 +32,7 @@ func (l *MiniMyLikeLogic) MiniMyLike(req *types.MiniMyLikeRequest) (resp *types.
32 32
33 total, list, err := l.svcCtx.UserLoveFlagRepository.Find(l.ctx, conn, domain.NewQueryOptions(). 33 total, list, err := l.svcCtx.UserLoveFlagRepository.Find(l.ctx, conn, domain.NewQueryOptions().
34 WithOffsetLimit(req.Page, req.Size). 34 WithOffsetLimit(req.Page, req.Size).
35 - WithKV("commentId", userToken.CompanyId). 35 + WithKV("companyId", userToken.CompanyId).
36 WithKV("userId", userToken.UserId)) 36 WithKV("userId", userToken.UserId))
37 if err != nil { 37 if err != nil {
38 return nil, err 38 return nil, err