From 036105ab477e1403ae7b593428dd6b9bac2318d7 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 17 Jun 2022 12:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E8=81=8C=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/demo/register/onboarding_process.go |  2 +-
 internal/rpc/msg/group_notification.go       | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go
index df9e088f4..ebad5a57b 100644
--- a/internal/demo/register/onboarding_process.go
+++ b/internal/demo/register/onboarding_process.go
@@ -170,7 +170,7 @@ func joinGroups(operationID, userID, userName string, groupIDList []string) {
 			GroupID:           groupID,
 			Reason:            "register auto join",
 			InvitedUserIDList: []string{userID},
-			OpUserID:          config.Config.Manager.AppManagerUid[0],
+			OpUserID:          config.Config.Manager.AppManagerUid[1],
 		}
 		resp, err := client.InviteUserToGroup(context.Background(), req)
 		if err != nil {
diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go
index 08b7d557d..aa9cdfd81 100644
--- a/internal/rpc/msg/group_notification.go
+++ b/internal/rpc/msg/group_notification.go
@@ -36,7 +36,6 @@ func setOpUserInfo(opUserID, groupID string, groupMemberInfo *open_im_sdk.GroupM
 				return utils.Wrap(err, "")
 			}
 		}
-
 		user, err := imdb.GetUserByUserID(opUserID)
 		if err != nil {
 			return utils.Wrap(err, "")
@@ -118,16 +117,13 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv
 
 	tips.JsonDetail, _ = marshaler.MarshalToString(m)
 	var nickname string
-	if utils.IsContain(sendID, config.Config.Manager.AppManagerUid) {
-		nickname = sendID
-	} else {
-		from, err := imdb.GetUserByUserID(sendID)
-		if err != nil {
-			log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID)
-		}
-		if from != nil {
-			nickname = from.Nickname
-		}
+
+	from, err := imdb.GetUserByUserID(sendID)
+	if err != nil {
+		log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID)
+	}
+	if from != nil {
+		nickname = from.Nickname
 	}
 
 	to, err := imdb.GetUserByUserID(recvUserID)