diff --git a/internal/rpc/msg/work_moments_notification.go b/internal/rpc/msg/work_moments_notification.go index 4631abf06..f9f64774e 100644 --- a/internal/rpc/msg/work_moments_notification.go +++ b/internal/rpc/msg/work_moments_notification.go @@ -11,7 +11,7 @@ import ( ) func WorkMomentSendNotification(operationID, sendID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) { - log.NewInfo(operationID, utils.GetSelfFuncName(), recvID) + log.NewInfo(operationID, utils.GetSelfFuncName(), sendID, recvID, notificationMsg) WorkMomentNotification(operationID, sendID, recvID, notificationMsg) } @@ -29,7 +29,7 @@ func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message) RecvID: recvID, MsgFrom: constant.UserMsgType, ContentType: constant.WorkMomentNotification, - SessionType: constant.UserMsgType, + SessionType: constant.SingleChatType, OperationID: operationID, } n.Content, err = proto.Marshal(m) diff --git a/pkg/base_info/work_moments_struct.go b/pkg/base_info/work_moments_struct.go index f71033c9a..ecc80f834 100644 --- a/pkg/base_info/work_moments_struct.go +++ b/pkg/base_info/work_moments_struct.go @@ -50,13 +50,13 @@ type WorkMoment struct { Content string `json:"content"` LikeUserList []*WorkMomentUser `json:"likeUsers"` Comments []*Comment `json:"comments"` - FaceURL string `json:"face_url"` - UserName string `json:"user_name"` + FaceURL string `json:"faceUrl"` + UserName string `json:"userName"` //Permission int32 `json:"permission"` //PermissionUserIDList []string `json:"permissionUserIDList"` //PermissionGroupIDList []string `json:"permissionGroupIDList"` AtUserList []*WorkMomentUser `json:"atUsers"` - CreateTime int32 `json:"createTime,omitempty"` + CreateTime int32 `json:"createTime"` } type WorkMomentUser struct { diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 4a08ffba4..0a593c5c7 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -575,7 +575,7 @@ type WorkMoment struct { AtUserList []*AtUser `bson:"at_user_list"` Comments []*Comment `bson:"comments"` PermissionUserIDList []string `bson:"permission_user_id_list"` - Permission int32 `bson:"is_private"` + Permission int32 `bson:"permission"` CreateTime int32 `bson:"create_time"` }