From 491fd33eabdc55efdb4309b9d07c2ab071fa213f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 20:14:58 +0800
Subject: [PATCH] fix
---
model/contact.go | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/model/contact.go b/model/contact.go
index 96a355b..abadcea 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -112,14 +112,20 @@
return record, err
}
-func (slf *ContactSearch) FindAll() ([]*ContactDetail, error) {
+func (slf *ContactSearch) FindAll() ([]*ContactDetail, int64, error) {
var db = slf.build()
var records = make([]*ContactDetail, 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").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *ContactSearch) SetId(id int) *ContactSearch {
@@ -163,3 +169,7 @@
slf.OrderBy = order
return slf
}
+func (slf *ContactSearch) SetIds(ids []int) *ContactSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
--
Gitblit v1.8.0