diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go
index 1fcc7d87f..63f1f76d5 100644
--- a/internal/rpc/friend/firend.go
+++ b/internal/rpc/friend/firend.go
@@ -262,10 +262,10 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName)
 	client := pbCache.NewCacheClient(etcdConn)
 	addFriendToCacheReq.UserID = req.CommID.ToUserID
-	addFriendToCacheReq.UserID = req.CommID.FromUserID
+	addFriendToCacheReq.FriendID = req.CommID.FromUserID
 	respPb, err := client.AddFriendToCache(context.Background(), addFriendToCacheReq)
 	addFriendToCacheReq.UserID = req.CommID.FromUserID
-	addFriendToCacheReq.UserID = req.CommID.ToUserID
+	addFriendToCacheReq.FriendID = req.CommID.ToUserID
 	respPb, err = client.AddFriendToCache(context.Background(), addFriendToCacheReq)
 	if err != nil {
 		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error())
diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go
index 17c8dc598..5fdc18435 100644
--- a/internal/rpc/office/office.go
+++ b/internal/rpc/office/office.go
@@ -450,6 +450,7 @@ func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.Com
 		Content:             comment.Content,
 		CreateTime:          comment.CreateTime,
 	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "msg: ", *workMomentNotificationMsg)
 	if req.UserID != workMoment.UserID {
 		msg.WorkMomentSendNotification(req.OperationID, workMoment.UserID, workMomentNotificationMsg)
 	}
@@ -510,16 +511,7 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}, WorkMoments: []*pbOffice.WorkMoment{}}
 	resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber}
-	friendIDList, err := imdb.GetFriendIDListByUserID(req.UserID)
-	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetFriendIDListByUserID", err.Error())
-		resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}
-		return resp, nil
-	}
-	for _, friendID := range friendIDList {
-		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), friendID)
-	}
-	workMoments, err := db.DB.GetUserFriendWorkMoments(friendIDList, req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID)
+	workMoments, err := db.DB.GetUserFriendWorkMoments(req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
 		resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}
diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go
index 408e50802..51ad1c324 100644
--- a/pkg/common/db/mongoModel.go
+++ b/pkg/common/db/mongoModel.go
@@ -692,7 +692,7 @@ func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, page
 	return workMomentList, err
 }
 
-func (d *DataBases) GetUserFriendWorkMoments(friendIDList []string, showNumber, pageNumber int32, userID string) ([]WorkMoment, error) {
+func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userID 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
@@ -700,7 +700,7 @@ func (d *DataBases) GetUserFriendWorkMoments(friendIDList []string, showNumber,
 	result, err := c.Find(ctx, bson.D{
 		{"$or", bson.A{
 			bson.D{{"user_id", userID}}, //self
-			bson.D{{"user_id", bson.D{{"$in", friendIDList}}},
+			bson.D{
 				{"$or", bson.A{
 					bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
 					bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},