修复接口筛选问题

This commit is contained in:
2026-03-24 14:44:54 +08:00
parent ad021f2faa
commit c9995ef566
2 changed files with 8 additions and 6 deletions

View File

@@ -28,13 +28,13 @@ func PageBillByAdmin(c *fiber.Ctx) error {
// 构造查询条件
do := q.Bill.Where()
if req.UserPhone != nil {
do = do.Where(q.User.Phone.Eq(*req.UserPhone))
do = do.Where(q.User.As("User").Phone.Eq(*req.UserPhone))
}
if req.TradeInnerNo != nil {
do = do.Where(q.Trade.InnerNo.Eq(*req.TradeInnerNo))
do = do.Where(q.Trade.As("Trade").InnerNo.Eq(*req.TradeInnerNo))
}
if req.ResourceNo != nil {
do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
}
if req.BillNo != nil {
do = do.Where(q.Bill.BillNo.Eq(*req.BillNo))
@@ -59,6 +59,7 @@ func PageBillByAdmin(c *fiber.Ctx) error {
q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
).
Where(do).
Order(q.Bill.CreatedAt.Desc()).
FindByPage(req.GetOffset(), req.GetLimit())
if err != nil {
return err