From e990118475595b4180f9da442decede20bae5e6f Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Thu, 1 Sep 2022 21:58:22 +0800
Subject: [PATCH] fix bug :pushMsg.MsgData.OfflinePushInfo==nil

---
 internal/push/logic/push_to_client.go              |  7 +++++--
 internal/rpc/group/group.go                        |  1 +
 .../im_mysql_model/group_member_model.go           | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go
index 2b8bbcfd8..d8e22836e 100644
--- a/internal/push/logic/push_to_client.go
+++ b/internal/push/logic/push_to_client.go
@@ -297,8 +297,11 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err
 			log.NewDebug(pushMsg.OperationID, opts)
 		}
 	}
-	opts.IOSBadgeCount = pushMsg.MsgData.OfflinePushInfo.IOSBadgeCount
-	opts.IOSPushSound = pushMsg.MsgData.OfflinePushInfo.IOSPushSound
+	if pushMsg.MsgData.OfflinePushInfo != nil {
+		opts.IOSBadgeCount = pushMsg.MsgData.OfflinePushInfo.IOSBadgeCount
+		opts.IOSPushSound = pushMsg.MsgData.OfflinePushInfo.IOSPushSound
+	}
+
 	return opts, nil
 }
 
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 7a821c34e..cf1033d4a 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -142,6 +142,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
 		}
 	}
+
 	if req.GroupInfo.GroupType != constant.SuperGroup {
 		//to group member
 		for _, user := range req.InitMemberList {
diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
index 89526b9de..d73ee287d 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
@@ -34,6 +34,20 @@ func InsertIntoGroupMember(toInsertInfo db.GroupMember) error {
 	return nil
 }
 
+func BatchInsertIntoGroupMember(toInsertInfoList []*db.GroupMember) error {
+	//MessageList []*model_struct.LocalChatLog
+	//return utils.Wrap(d.conn.Create(MessageList).Error, "BatchInsertMessageList failed")
+	for _, toInsertInfo := range toInsertInfoList {
+		toInsertInfo.JoinTime = time.Now()
+		if toInsertInfo.RoleLevel == 0 {
+			toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
+		}
+		toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
+	}
+	return db.DB.MysqlDB.DefaultGormDB().Create(toInsertInfoList).Error
+
+}
+
 func GetGroupMemberListByUserID(userID string) ([]db.GroupMember, error) {
 	var groupMemberList []db.GroupMember
 	err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error