diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 25f1c3203..9a9fd3d7c 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -546,7 +546,6 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string { return e.GroupID }) - log.ZDebug(ctx, "groups return", "groups", groups, "owners", owners, "ownerMap", ownerMap, "groupMemberNumMap", groupMemberNumMap) resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo { return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]) }) @@ -621,7 +620,6 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) (resp *pbGroup.JoinGroupResp, err error) { - resp = &pbGroup.JoinGroupResp{} user, err := s.UserCheck.GetUserInfo(ctx, req.InviterUserID) if err != nil { return nil, err @@ -639,6 +637,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) } else if !s.IsNotFound(err) { return nil, err } + resp = &pbGroup.JoinGroupResp{} if group.NeedVerification == constant.Directly { if group.GroupType == constant.SuperGroup { return nil, errs.ErrGroupTypeNotSupport.Wrap() diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 0a0170047..6aced79dc 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -125,8 +125,9 @@ func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationTb.Gr for _, groupMember := range groupMembers { if _, ok := m[groupMember.GroupID]; !ok { m[groupMember.GroupID] = struct{}{} - cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelJoinedGroupID(groupMember.UserID).DelGroupsMemberNum(groupMember.GroupID) + cache = cache.DelGroupMemberIDs(groupMember.GroupID).DelGroupMembersHash(groupMember.GroupID).DelGroupsMemberNum(groupMember.GroupID) } + cache.DelJoinedGroupID(groupMember.UserID) } return cache.ExecDel(ctx) })