修复查询套餐列表时的连接顺序,确保正确获取相关数据
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user