From 6d9ee74360eecd2352c4a1d98737700d3a23e0d0 Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Thu, 30 Dec 2021 09:38:07 +0800
Subject: [PATCH] Refactor code

---
 internal/rpc/group/group.go                                | 2 +-
 .../db/mysql_model/im_mysql_model/group_request_model.go   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 615e69efa..a959778af 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -453,7 +453,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 	log.NewInfo(req.OperationID, "JoinGroup args ", req.String())
 	_, err := imdb.GetUserByUserID(req.OpUserID)
 	if err != nil {
-		log.NewError(req.OperationID, "FindUserByUID failed ", err.Error(), req.OpUserID)
+		log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.OpUserID)
 		return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 
diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
index cd6cf641f..9e7266b02 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
@@ -23,11 +23,10 @@ func UpdateGroupRequest(groupRequest GroupRequest) error {
 	if err != nil {
 		return err
 	}
-	err = dbConn.Table("group_request").Where("group_id=? and user_id=?", groupRequest.GroupID, groupRequest.UserID).Update(&groupRequest).Error
-	if err != nil {
-		return err
+	//RowsAffected
+	if dbConn.Table("group_request").Where("group_id=? and user_id=?", groupRequest.GroupID, groupRequest.UserID).Update(&groupRequest).RowsAffected == 0 {
+		return InsertIntoGroupRequest(groupRequest)
 	}
-	return nil
 }
 
 func InsertIntoGroupRequest(toInsertInfo GroupRequest) error {