修复翻页查询问题

README.md

@@ -2,6 +2,14 @@
 
 核心流程：
 
+完成账户总览
+
+表格页筛选日期，范围筛选需要联动
+
+购买套餐页的冗余组件
+
+确认各个页面操作列的内容
+
 - [ ] 提取记录
 - [ ] 使用记录
 

web/handlers/bill.go

@@ -39,19 +39,19 @@ func ListBill(c *fiber.Ctx) error {
 		Where(q.Bill.UserID.Eq(authContext.Payload.Id))
 
 	if req.Type != nil {
-		do = do.Where(q.Bill.Type.Eq(int32(*req.Type)))
+		do.Where(q.Bill.Type.Eq(int32(*req.Type)))
 	}
 	if req.CreateAfter != nil {
-		do = do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
+		do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
 	}
 	if req.CreateBefore != nil {
-		do = do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
+		do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
 	}
 	if req.BillNo != nil && *req.BillNo != "" {
-		do = do.Where(q.Bill.BillNo.Eq(*req.BillNo))
+		do.Where(q.Bill.BillNo.Eq(*req.BillNo))
 	}
 
-	bills, err := do.
+	bills, err := q.Bill.Where(do).
 		Preload(q.Bill.Resource, q.Bill.Trade, q.Bill.Refund).
 		Preload(q.Bill.Resource.Pss).
 		Order(q.Bill.CreatedAt.Desc()).
@@ -66,7 +66,7 @@ func ListBill(c *fiber.Ctx) error {
 	if len(bills) < req.GetLimit() {
 		total = int64(len(bills) + req.GetOffset())
 	} else {
-		total, err = do.Count()
+		total, err = q.Bill.Where(do).Count()
 		if err != nil {
 			return err
 		}

web/handlers/channel.go

@@ -68,9 +68,7 @@ func ListChannels(c *fiber.Ctx) error {
 	if len(channels) < req.GetLimit() {
 		total = int64(len(channels) + req.GetOffset())
 	} else {
-		total, err = q.Channel.Debug().
-			Where(cond).
-			Count()
+		total, err = q.Channel.Where(cond).Count()
 		if err != nil {
 			return err
 		}

web/handlers/resource.go

@@ -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
 		}

web/handlers/whitelist.go

@@ -40,7 +40,7 @@ func ListWhitelist(c *fiber.Ctx) error {
 	do := q.Whitelist.
 		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id))
 
-	list, err := do.
+	list, err := q.Whitelist.Where(do).
 		Offset(req.GetOffset()).
 		Limit(req.GetLimit()).
 		Order(q.Whitelist.CreatedAt.Desc()).
@@ -53,7 +53,7 @@ func ListWhitelist(c *fiber.Ctx) error {
 	if len(list) < req.GetLimit() {
 		total = int64(len(list) + req.GetOffset())
 	} else {
-		total, err = do.Count()
+		total, err = q.Whitelist.Where(do).Count()
 		if err != nil {
 			return err
 		}