From c59053ef98942526930480345636ad3bb7b55596 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期四, 27 七月 2023 14:28:40 +0800 Subject: [PATCH] fix --- model/salesReturn.go | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/model/salesReturn.go b/model/salesReturn.go index 96cc96c..6c212d8 100644 --- a/model/salesReturn.go +++ b/model/salesReturn.go @@ -74,11 +74,19 @@ return record, err } -func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, error) { +func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, int64, error) { var db = slf.build() var records = make([]*SalesReturn, 0) + if slf.PageNum > 0 && slf.PageSize > 0 { + db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) + } + var total int64 + if err := db.Count(&total).Error; err != nil { + return records, total, err + } + err := db.Preload("Products").Find(&records).Error - return records, err + return records, total, err } func (slf *SalesReturnSearch) SetId(id int) *SalesReturnSearch { @@ -99,4 +107,4 @@ func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch { slf.OrderBy = order return slf -} +} \ No newline at end of file -- Gitblit v1.8.0