From 574630de7e247ba667284cc212bc599dd0fe9998 Mon Sep 17 00:00:00 2001 From: luorijun Date: Wed, 30 Apr 2025 18:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=A5=97?= =?UTF-8?q?=E9=A4=90=E5=88=97=E8=A1=A8=E6=97=B6=E7=9A=84=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/handlers/resource.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/handlers/resource.go b/web/handlers/resource.go index 2db22ae..2e1b626 100644 --- a/web/handlers/resource.go +++ b/web/handlers/resource.go @@ -40,7 +40,6 @@ func ListResourcePss(c *fiber.Ctx) error { // 查询套餐列表 do := q.Resource. - Joins(q.Resource.Pss). Where(q.Resource.UserID.Eq(authContext.Payload.Id)) if req.ResourceNo != nil && *req.ResourceNo != "" { do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo)) @@ -65,6 +64,7 @@ func ListResourcePss(c *fiber.Ctx) error { } resource, err := q.Resource.Where(do). + Joins(q.Resource.Pss). Order(q.Resource.CreatedAt.Desc()). Offset(req.GetOffset()). Limit(req.GetLimit()). @@ -77,7 +77,9 @@ func ListResourcePss(c *fiber.Ctx) error { if len(resource) < req.GetLimit() { total = int64(len(resource) + req.GetOffset()) } else { - total, err = q.Resource.Where(do).Count() + total, err = q.Resource. + Where(do). + Count() if err != nil { return err }