From d3ff95a6631915cd56ac7f774f5fca297b9f5642 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期三, 26 七月 2023 19:55:32 +0800 Subject: [PATCH] fix --- model/contacts.go | 3 +++ model/client.go | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/model/client.go b/model/client.go index e76a52d..3df4638 100644 --- a/model/client.go +++ b/model/client.go @@ -113,6 +113,10 @@ func (slf *ClientSearch) Find() ([]*Client, error) { var db = slf.build() var records = make([]*Client, 0) + if slf.PageNum > 0 && slf.PageSize > 0 { + db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) + } + err := db.Preload("ClientStatus").Preload("ClientType").Preload("ClientOrigin").Preload("ClientLevel").Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error return records, err } @@ -135,4 +139,4 @@ func (slf *ClientSearch) SetOrder(order string) *ClientSearch { slf.OrderBy = order return slf -} +} \ No newline at end of file diff --git a/model/contacts.go b/model/contacts.go index 7e7b9bb..96a355b 100644 --- a/model/contacts.go +++ b/model/contacts.go @@ -115,6 +115,9 @@ func (slf *ContactSearch) FindAll() ([]*ContactDetail, error) { var db = slf.build() var records = make([]*ContactDetail, 0) + if slf.PageNum > 0 && slf.PageSize > 0 { + db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) + } err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error return records, err } -- Gitblit v1.8.0