From b18813689d29541f770beb5166abe4792013e316 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 27 Sep 2022 15:45:47 +0800 Subject: [PATCH] workmoment --- internal/rpc/office/office.go | 8 +++++++- pkg/common/config/config.go | 4 ++-- pkg/common/db/mongoModel.go | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 2ca4f84a8..ac997805c 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -647,7 +647,13 @@ func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUs if req.UserID == req.OpUserID { workMoments, err = db.DB.GetUserSelfWorkMoments(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) } else { - workMoments, err = db.DB.GetUserWorkMoments(req.OpUserID, req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) + friendIDList, err := rocksCache.GetFriendIDListFromCache(req.UserID) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error()) + resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()} + return resp, nil + } + workMoments, err = db.DB.GetUserWorkMoments(req.OpUserID, req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber, friendIDList) } if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserWorkMoments failed", err.Error()) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index b233a92e1..f8acd8993 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -511,11 +511,11 @@ type config struct { JoinDepartmentIDList []string `yaml:"joinDepartmentIDList"` JoinDepartmentGroups bool `yaml:"joinDepartmentGroups"` OaNotification bool `yaml:"oaNotification"` - CreateOrganizationUserAndJoinDepartment bool `json:"createOrganizationUserAndJoinDepartment"` + CreateOrganizationUserAndJoinDepartment bool `yaml:"createOrganizationUserAndJoinDepartment"` } WorkMoment struct { OnlyFriendCanSee bool `yaml:"onlyFriendCanSee"` - } + } `yaml:"workMoment"` Rtc struct { SignalTimeout string `yaml:"signalTimeout"` } `yaml:"rtc"` diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 67ba9dde6..1e4d7b01d 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -970,7 +970,7 @@ func (d *DataBases) GetUserSelfWorkMoments(userID string, showNumber, pageNumber return workMomentList, err } -func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, pageNumber int32) ([]WorkMoment, error) { +func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, pageNumber int32, friendIDList []string) ([]WorkMoment, error) { ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment) var workMomentList []WorkMoment