From 5741d1c711da0b3a150985934965d0e4f5bc7656 Mon Sep 17 00:00:00 2001
From: luhaoling <2198702716@qq.com>
Date: Thu, 28 Dec 2023 10:09:43 +0800
Subject: [PATCH] fix: fix the error

---
 internal/rpc/group/group.go       | 11 +----------
 pkg/common/db/controller/group.go | 24 ------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 592c96333..ba129d7e9 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -476,16 +476,7 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbgroup.GetGro
 
 func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbgroup.GetGroupMemberListReq) (*pbgroup.GetGroupMemberListResp, error) {
 	resp := &pbgroup.GetGroupMemberListResp{}
-	var (
-		total   int64
-		members []*relationtb.GroupMemberModel
-		err     error
-	)
-	if req.GroupNickname == "" {
-		total, members, err = s.db.PageGetGroupMember(ctx, req.GroupID, req.Pagination)
-	} else {
-		total, members, err = s.db.FindGroupMemberByNickname(ctx, req.GroupID, req.GroupNickname, req.Pagination)
-	}
+	total, members, err := s.db.PageGetGroupMember(ctx, req.GroupID, req.Pagination)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go
index 22ab3597e..4147d59c0 100644
--- a/pkg/common/db/controller/group.go
+++ b/pkg/common/db/controller/group.go
@@ -45,7 +45,6 @@ type GroupDatabase interface {
 	FindGroupMemberUser(ctx context.Context, groupIDs []string, userID string) (groupMembers []*relationtb.GroupMemberModel, err error)         // *
 	FindGroupMemberRoleLevels(ctx context.Context, groupID string, roleLevels []int32) (groupMembers []*relationtb.GroupMemberModel, err error) // *
 	FindGroupMemberAll(ctx context.Context, groupID string) (groupMembers []*relationtb.GroupMemberModel, err error)                            // *
-	FindGroupMemberByNickname(ctx context.Context, groupID string, nickName string, pagination pagination.Pagination) (int64, []*relationtb.GroupMemberModel, error)
 	FindGroupsOwner(ctx context.Context, groupIDs []string) ([]*relationtb.GroupMemberModel, error)
 	FindGroupMemberUserID(ctx context.Context, groupID string) ([]string, error)
 	FindGroupMemberNum(ctx context.Context, groupID string) (uint32, error)
@@ -120,29 +119,6 @@ func (g *groupDatabase) FindGroupMemberAll(ctx context.Context, groupID string)
 	return g.cache.GetAllGroupMembersInfo(ctx, groupID)
 }
 
-func (g *groupDatabase) FindGroupMemberByNickname(ctx context.Context, groupID string, Nickname string, pagination pagination.Pagination) (int64, []*relationtb.GroupMemberModel, error) {
-	members, err := g.cache.GetAllGroupMembersInfo(ctx, groupID)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	var total int64
-	groupMembers := make([]*relationtb.GroupMemberModel, 0)
-	for _, member := range members {
-		if member.Nickname == Nickname {
-			groupMembers = append(groupMembers, member)
-			total++
-		}
-	}
-
-	GMembers := utils.Paginate(groupMembers, int(pagination.GetPageNumber()), int(pagination.GetShowNumber()))
-	if len(GMembers) == 0 {
-		return int64(len(groupMembers)), nil, nil
-	}
-
-	return total, GMembers, nil
-}
-
 func (g *groupDatabase) FindGroupsOwner(ctx context.Context, groupIDs []string) ([]*relationtb.GroupMemberModel, error) {
 	return g.cache.GetGroupsOwner(ctx, groupIDs)
 }