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/salesLeads.go | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/model/salesLeads.go b/model/salesLeads.go index a7f69f4..796e15e 100644 --- a/model/salesLeads.go +++ b/model/salesLeads.go @@ -113,11 +113,19 @@ return } -func (slf *SalesLeadsSearch) FindAll() ([]*SalesLeads, error) { +func (slf *SalesLeadsSearch) FindAll() ([]*SalesLeads, int64, error) { var db = slf.build() - var results []*SalesLeads - err := db.Preload("FollowRecord").Find(&results).Error - return results, err + var records = make([]*SalesLeads, 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("FollowRecord").Find(&records).Error + return records, total, err } func (slf *SalesLeadsSearch) SetId(id int) *SalesLeadsSearch { @@ -150,3 +158,8 @@ slf.OrderBy = order return slf } + +func (slf *SalesLeadsSearch) UpdateMap(data map[string]interface{}) error { + var db = slf.build() + return db.Updates(data).Error +} -- Gitblit v1.8.0