From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix
---
model/contact.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/model/contact.go b/model/contact.go
index fb98163..3fc6048 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -115,14 +115,14 @@
func (slf *ContactSearch) FindAll() ([]*ContactDetail, int64, 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)
- }
-
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, total, err
@@ -168,4 +168,4 @@
func (slf *ContactSearch) SetOrder(order string) *ContactSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0