internal/dao/bundleDao.go

@@ -135,27 +135,23 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 	res.Bundles = make([]*bundle.BundleProfile, 0)
 	bundles := make([]*model.BundleProfile, 0)
 
-	baseQuery := app.ModuleClients.BundleDB.Model(&model.BundleProfile{})
+	query := app.ModuleClients.BundleDB.Model(&model.BundleProfile{}).Preload("BundleProfileLang")
 
 	if req.Name != "" {
-		baseQuery = baseQuery.Where("name like ?", "%"+req.Name+"%")
+		query = query.Where("name like ?", "%"+req.Name+"%")
 	}
 
 	if req.Content != "" {
-		baseQuery = baseQuery.Where("content like ?", "%"+req.Content+"%")
+		query = query.Where("content like ?", "%"+req.Content+"%")
 	}
 
 	if req.Language != "" {
-		baseQuery = baseQuery.Where("language like ?", req.Language)
+		query = query.Where("language like ?", req.Language)
 	}
 
-	var total int64
-	if err = baseQuery.Count(&total).Error; err != nil {
-		return res, commonErr.ReturnError(err, msg.ErrorGetBundleList, "获取套餐总数失败: ")
-	}
+	count := *query
 
 	// 排序：sort 升序，相同 sort 按 created_at 倒序
-	query := baseQuery.Preload("BundleProfileLang")
 	query = query.Order("sort ASC").Order("created_at DESC")
 	if req.PageSize != 0 && req.Page != 0 {
 		query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
@@ -227,6 +223,10 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 		}
 	}
 
+	var total int64
+
+	count.Count(&total)
+
 	res.Total = int32(total)
 
 	return