From a958c308560478ce99a81133e825acb9aeff2d60 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:04:34 +0800
Subject: [PATCH] fix
---
model/client.go | 6 +++---
model/followRecord.go | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/model/client.go b/model/client.go
index 2dc0889..8c694d8 100644
--- a/model/client.go
+++ b/model/client.go
@@ -112,13 +112,13 @@
func (slf *ClientSearch) Find() ([]*Client, int64, 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)
- }
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("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, total, err
diff --git a/model/followRecord.go b/model/followRecord.go
index b90aabe..5a2ab82 100644
--- a/model/followRecord.go
+++ b/model/followRecord.go
@@ -115,13 +115,13 @@
func (slf *FollowRecordSearch) FindAll() ([]*FollowRecord, int64, error) {
var db = slf.build()
var records = make([]*FollowRecord, 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("Client").Preload("Contact").Find(&records).Error
return records, total, err
--
Gitblit v1.8.0