diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index f89c68a0e..a581d09f6 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1448,7 +1448,6 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req * if err != nil { return nil, err } - resp.Total = int64(total) if len(requests) == 0 { return resp, nil } @@ -1482,5 +1481,6 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req * resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest { return convert.Db2PbGroupRequest(e, nil, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID]))) }) + resp.Total = total return resp, nil } diff --git a/pkg/common/db/relation/group_request_model.go b/pkg/common/db/relation/group_request_model.go index 11eb5b30f..ff8233846 100644 --- a/pkg/common/db/relation/group_request_model.go +++ b/pkg/common/db/relation/group_request_model.go @@ -112,11 +112,6 @@ func (g *GroupRequestGorm) PageGroup( } func (g *GroupRequestGorm) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (total int64, groupRequests []*relation.GroupRequestModel, err error) { - return int64(len(groupRequests)), groupRequests, utils.Wrap( - g.DB.WithContext(ctx). - Where("group_id = ? and user_id in ?", groupID, userIDs). - Find(&groupRequests). - Error, - utils.GetSelfFuncName(), - ) + err = g.DB.WithContext(ctx).Where("group_id = ? and user_id in ?", groupID, userIDs).Find(&groupRequests).Error + return int64(len(groupRequests)), groupRequests, utils.Wrap(err, utils.GetSelfFuncName()) }