From de7d4fac8554de2a4d183cf3afbbc4f8e29702d7 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 24 Mar 2023 20:24:38 +0800
Subject: [PATCH] group

---
 internal/rpc/group/group.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 41b7a15fb..2b385e552 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -280,6 +280,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 						GroupID:       req.GroupID,
 						JoinSource:    constant.JoinByInvitation,
 						InviterUserID: opUserID,
+						ReqTime:       time.Now(),
+						HandledTime:   time.Unix(0, 0),
 					})
 				}
 				if err := s.GroupDatabase.CreateGroupRequest(ctx, requests); err != nil {
@@ -656,11 +658,12 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 		return resp, nil
 	}
 	groupRequest := relationTb.GroupRequestModel{
-		UserID:     mcontext.GetOpUserID(ctx),
-		ReqMsg:     req.ReqMessage,
-		GroupID:    req.GroupID,
-		JoinSource: req.JoinSource,
-		ReqTime:    time.Now(),
+		UserID:      mcontext.GetOpUserID(ctx),
+		ReqMsg:      req.ReqMessage,
+		GroupID:     req.GroupID,
+		JoinSource:  req.JoinSource,
+		ReqTime:     time.Now(),
+		HandledTime: time.Unix(0, 0),
 	}
 	if err := s.GroupDatabase.CreateGroupRequest(ctx, []*relationTb.GroupRequestModel{&groupRequest}); err != nil {
 		return nil, err
@@ -691,7 +694,6 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
 }
 
 func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
-	resp := &pbGroup.SetGroupInfoResp{}
 	if !tokenverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
@@ -712,6 +714,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	if err != nil {
 		return nil, err
 	}
+	resp := &pbGroup.SetGroupInfoResp{}
 	data := UpdateGroupInfoMap(req.GroupInfoForSet)
 	if len(data) == 0 {
 		return resp, nil