Merge remote-tracking branch 'origin/superGroup' into superGroup

internal/demo/register/onboarding_process.go

@@ -261,7 +261,7 @@ func randomEnglishName() string {
 }
 
 func randomPosition() string {
-	l := []string{"Golang工程师", "前端工程师", "后端工程师", "产品经理", "测试开发工程师", "运维开发工程师"}
+	l := []string{"后端工程师", "前端工程师", "设计师"}
 	rand.Seed(time.Now().UnixNano())
 	index := rand.Intn(len(l) - 1)
 	return l[index]

internal/rpc/msg/group_notification.go

@@ -117,15 +117,19 @@ 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)
-	}
-	nickname := ""
-	if from != nil {
-		nickname = from.Nickname
-	}
 	to, err := imdb.GetUserByUserID(recvUserID)
 	if err != nil {
 		log.NewWarn(operationID, "GetUserByUserID failed ", err.Error(), recvUserID)