From 9dc846c044b7695112f1eb4597e140a492bf2b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Tue, 27 Jun 2023 17:01:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(invoice):=E4=BF=AE=E6=AD=A3=E5=AF=B9?= =?UTF-8?q?=E4=BA=8E=E5=8F=91=E7=A5=A8=E7=9A=84=E6=A3=80=E7=B4=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repository/invoice.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/repository/invoice.go b/repository/invoice.go index 21a5505..6fc3885 100644 --- a/repository/invoice.go +++ b/repository/invoice.go @@ -40,6 +40,7 @@ func (ir _InvoiceRepository) ListInvoice(pid *string, startDate, endDate *types. Select("i.*") countQuery := ir.ds. From(goqu.T("invoice").As("i")). + Join(goqu.T("tenement").As("t"), goqu.On(goqu.I("i.tenement_id").Eq(goqu.I("t.id")))). Select(goqu.COUNT("*")) if pid != nil && len(*pid) > 0 { @@ -76,8 +77,10 @@ func (ir _InvoiceRepository) ListInvoice(pid *string, startDate, endDate *types. if endDate != nil { queryRange.SetUpper(endDate.ToEndingOfDate()) } - invoiceQuery = invoiceQuery.Where(goqu.L("i.issued_at <@ ?", queryRange)) - countQuery = countQuery.Where(goqu.L("i.issued_at <@ ?", queryRange)) + if !queryRange.IsEmptyOrWild() { + invoiceQuery = invoiceQuery.Where(goqu.L("i.issued_at <@ ?", queryRange)) + countQuery = countQuery.Where(goqu.L("i.issued_at <@ ?", queryRange)) + } startRow := (page - 1) * config.ServiceSettings.ItemsPageSize invoiceQuery = invoiceQuery.