From dac214fa72dc2974954a4d8ee934695f548ad155 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期三, 02 八月 2023 14:14:30 +0800 Subject: [PATCH] fix --- model/orderManage.go | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/model/orderManage.go b/model/orderManage.go index 34b9477..2712759 100644 --- a/model/orderManage.go +++ b/model/orderManage.go @@ -24,12 +24,11 @@ OrderManageSearch struct { OrderManage - Orm *gorm.DB + Orm *gorm.DB Keyword string OrderBy string PageNum int PageSize int - } ) @@ -77,11 +76,19 @@ return record, err } -func (slf *OrderManageSearch) FindAll() ([]*OrderManage, error) { +func (slf *OrderManageSearch) FindAll() ([]*OrderManage, int64, error) { var db = slf.build() - var record = make([]*OrderManage, 0) - err := db.Preload("Client").Find(&record).Error - return record, err + var records = make([]*OrderManage, 0) + var total int64 + if err := db.Count(&total).Error; err != nil { + return records, total, err + } + if slf.PageNum > 0 && slf.PageSize > 0 { + db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) + } + + err := db.Preload("Client").Find(&records).Error + return records, total, err } func (slf *OrderManageSearch) SetId(id int) *OrderManageSearch { -- Gitblit v1.8.0