lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 12 Activity

修复翻页查询问题

Browse Source
This commit is contained in:
luorijun
2025-04-30 10:43:30 +08:00
parent f2ea7b152a
commit 64084f5303
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/handlers/resource.go
View File

@@ -43,28 +43,28 @@ func ListResourcePss(c *fiber.Ctx) error {
Joins(q.Resource.Pss).
Where(q.Resource.UserID.Eq(authContext.Payload.Id))
if req.ResourceNo != nil && *req.ResourceNo != "" {
do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
}
if req.Active != nil {
do = do.Where(q.Resource.Active.Is(*req.Active))
do.Where(q.Resource.Active.Is(*req.Active))
}
if req.Type != nil {
do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do = do.Where(q.Resource.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
do.Where(q.Resource.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do = do.Where(q.Resource.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
do.Where(q.Resource.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
}
if req.ExpireAfter != nil {
do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(common.LocalDateTime(*req.ExpireAfter)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(common.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(common.LocalDateTime(*req.ExpireBefore)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(common.LocalDateTime(*req.ExpireBefore)))
}
resource, err := do.Debug().
resource, err := q.Resource.Where(do).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
Limit(req.GetLimit()).
@@ -77,7 +77,7 @@ func ListResourcePss(c *fiber.Ctx) error {
if len(resource) < req.GetLimit() {
total = int64(len(resource) + req.GetOffset())
} else {
total, err = do.Count()
total, err = q.Resource.Where(do).Count()
if err != nil {
return err
}