diff --git a/internal/dao/invoiceDao.go b/internal/dao/invoiceDao.go index 636dd57..22ec0b8 100644 --- a/internal/dao/invoiceDao.go +++ b/internal/dao/invoiceDao.go @@ -99,7 +99,7 @@ func GetInvoiceList(req *bundle.GetInvoiceListReq) (data []*model.InvoiceInfo, t COALESCE(pia.phone, user.tel_num) AS phone, COALESCE(pia.country, rn.nationality) AS country, COALESCE(pia.address, rn.place_of_residence) AS address, - COALESCE(pia.apply_time, invoice.apply_time) AS apply_time, + pia.apply_time AS apply_time, invoice.user_name AS user_name, invoice.user_num AS user_num, invoice.order_no AS order_no, @@ -145,8 +145,8 @@ func GetInvoiceList(req *bundle.GetInvoiceListReq) (data []*model.InvoiceInfo, t if req.UserName != "" { query = query.Where("invoice.user_name LIKE ?", "%"+req.UserName+"%") } + query.Order("pia.apply_time DESC") query = query.Count(&total) - query.Order("invoice.apply_time DESC") err = query.Offset(int(req.Page-1) * int(req.Size)).Limit(int(req.Size)).Find(&data).Error if err != nil { return nil, 0, err