diff --git a/internal/rpc/msg/work_moments_notification.go b/internal/rpc/msg/work_moments_notification.go
index af333a354..b8eaff9a4 100644
--- a/internal/rpc/msg/work_moments_notification.go
+++ b/internal/rpc/msg/work_moments_notification.go
@@ -12,9 +12,9 @@ import (
 
 func WorkMomentSendNotification(operationID, sendID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) {
 	log.NewInfo(operationID, utils.GetSelfFuncName(), sendID, recvID, notificationMsg)
-	//if sendID == recvID {
-	//	return
-	//}
+	if sendID == recvID {
+		return
+	}
 	WorkMomentNotification(operationID, sendID, recvID, notificationMsg)
 }
 
diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go
index 19b21a8ec..e0397d572 100644
--- a/internal/rpc/office/office.go
+++ b/internal/rpc/office/office.go
@@ -305,7 +305,7 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea
 			UserName:            createUser.Nickname,
 			CreateTime:          workMoment.CreateTime,
 		}
-		msg.WorkMomentSendNotification(req.OperationID, atUser.UserID, atUser.UserID, workMomentNotificationMsg)
+		msg.WorkMomentSendNotification(req.OperationID, req.WorkMoment.UserID, atUser.UserID, workMomentNotificationMsg)
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil