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/serviceFollowup.go | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go index fab5cf9..c6baa40 100644 --- a/model/serviceFollowup.go +++ b/model/serviceFollowup.go @@ -82,11 +82,23 @@ return record, err } -func (slf *ServiceFollowupSearch) FindAll() ([]*ServiceFollowup, error) { +func (slf *ServiceFollowupSearch) FindAll() ([]*ServiceFollowup, int64, error) { var db = slf.build() var records = make([]*ServiceFollowup, 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) + } + + if slf.PageNum > 0 && slf.PageSize > 0 { + db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) + } + err := db.Preload("CustomerServiceSheet").Find(&records).Error - return records, err + return records, total, err } func (slf *ServiceFollowupSearch) SetId(id int) *ServiceFollowupSearch { @@ -109,4 +121,4 @@ func (slf *ServiceFollowupSearch) SetOrder(order string) *ServiceFollowupSearch { slf.OrderBy = order return slf -} +} \ No newline at end of file -- Gitblit v1.8.0