优化mongo，封装count逻辑，处理objectId

dao/cid_request_dao.go

@@ -5,9 +5,9 @@ import (
 
 	"cid/model/entity"
 
+	"gitee.com/red-future---jilin-g/common/beans"
 	"gitee.com/red-future---jilin-g/common/mongo"
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 var CIDRequest = &cidRequestDao{}
@@ -31,19 +31,9 @@ func (d *cidRequestDao) Create(ctx context.Context, request *entity.CidRequest)
 func (d *cidRequestDao) GetHistory(ctx context.Context, userId string, page, size int) (list []*entity.CidRequest, total int64, err error) {
 	filter := bson.M{"userId": userId}
 
-	// 获取总数
-	total, err = mongo.DB().Count(ctx, filter, entity.CidRequestCollection)
-	if err != nil {
-		return
-	}
-
-	// 分页查询
-	offset := (page - 1) * size
-	err = mongo.DB().Find(ctx, filter, &list, entity.CidRequestCollection,
-		options.Find().SetSort(bson.M{"createdAt": -1}).
-			SetSkip(int64(offset)).
-			SetLimit(int64(size)))
-
+	// 分页查询，使用common/mongo的Find方法，自动处理分页、租户等
+	pageBean := &beans.Page{PageNum: int64(page), PageSize: int64(size)}
+	total, err = mongo.DB().Find(ctx, filter, &list, entity.CidRequestCollection, pageBean, nil)
 	return
 }