This commit is contained in:
xing 2023-11-16 22:52:14 +08:00
parent 66c02f7fc9
commit 7bbc961f72
2 changed files with 4 additions and 3 deletions

View File

@ -3,6 +3,7 @@ package dao
import ( import (
"context" "context"
"github.com/fthvgb1/wp-go/app/pkg/models" "github.com/fthvgb1/wp-go/app/pkg/models"
"github.com/fthvgb1/wp-go/helper"
"github.com/fthvgb1/wp-go/helper/number" "github.com/fthvgb1/wp-go/helper/number"
"github.com/fthvgb1/wp-go/helper/slice" "github.com/fthvgb1/wp-go/helper/slice"
"github.com/fthvgb1/wp-go/model" "github.com/fthvgb1/wp-go/model"
@ -11,7 +12,7 @@ import (
// RecentComments // RecentComments
// param context.Context // param context.Context
func RecentComments(ctx context.Context, a ...any) (r []models.Comments, err error) { func RecentComments(ctx context.Context, a ...any) (r []models.Comments, err error) {
n := a[1].(int) n := helper.ParseArgs(10, a...)
return model.Finds[models.Comments](ctx, model.Conditions( return model.Finds[models.Comments](ctx, model.Conditions(
model.Where(model.SqlBuilder{ model.Where(model.SqlBuilder{
{"comment_approved", "1"}, {"comment_approved", "1"},
@ -28,7 +29,7 @@ func RecentComments(ctx context.Context, a ...any) (r []models.Comments, err err
// param1 context.Context // param1 context.Context
// param2 postId // param2 postId
func PostComments(ctx context.Context, postId uint64, _ ...any) ([]uint64, error) { func PostComments(ctx context.Context, postId uint64, _ ...any) ([]uint64, error) {
r, err := model.Finds[models.Comments](ctx, model.Conditions( r, err := model.ChunkFind[models.Comments](ctx, 300, model.Conditions(
model.Where(model.SqlBuilder{ model.Where(model.SqlBuilder{
{"comment_approved", "1"}, {"comment_approved", "1"},
{"comment_post_ID", "=", number.IntToString(postId), "int"}, {"comment_post_ID", "=", number.IntToString(postId), "int"},

View File

@ -54,7 +54,7 @@ func chunkFind[T Model](db dbQuery, ctx context.Context, perLimit int, q *QueryC
rr, err = finds[T](db, ctx, q) rr, err = finds[T](db, ctx, q)
} }
offset += perLimit offset += perLimit
if (err != nil && err != sql.ErrNoRows) || len(rr) < 1 { if (err != nil && !errors.Is(err, sql.ErrNoRows)) || len(rr) < 1 {
return return
} }
r = append(r, rr...) r = append(r, rr...)