black bug

pkg/common/db/relation/black_model.go

@@ -2,6 +2,7 @@ package relation
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 	"gorm.io/gorm"
@@ -50,6 +51,8 @@ func (b *BlackGorm) FindOwnerBlacks(ctx context.Context, ownerUserID string, pag
 		return nil, 0, utils.Wrap(err, "")
 	}
 	err = utils.Wrap(b.db(ctx).Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&blacks).Error, "")
+	totalUint32, blacks, err := gormPage[relation.BlackModel](b.db(ctx), pageNumber, showNumber)
+	total = int64(totalUint32)
 	return
 }
 

pkg/common/db/relation/group_request_model.go

@@ -2,6 +2,7 @@ package relation
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 	"gorm.io/gorm"

pkg/common/db/relation/meta_db.go

@@ -20,3 +20,7 @@ func NewMetaDB(db *gorm.DB, table any) *MetaDB {
 func (g *MetaDB) db(ctx context.Context) *gorm.DB {
 	return g.DB.WithContext(ctx).Model(g.table)
 }
+
+func (g *MetaDB) page(pageNumber, showNumber int32) *gorm.DB {
+	return g.DB.Limit(int(showNumber)).Offset(int(pageNumber*showNumber-1))
+}

pkg/common/db/relation/utils.go

@@ -7,7 +7,7 @@ import (
 
 func gormPage[E any](db *gorm.DB, pageNumber, showNumber int32) (uint32, []*E, error) {
 	var count int64
-	if err := db.Model(new(E)).Count(&count).Error; err != nil {
+	if err := db.Count(&count).Error; err != nil {
 		return 0, nil, utils.Wrap(err, "")
 	}
 	var es []*E