From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
model/contract.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/model/contract.go b/model/contract.go
index d0c0e78..024cf8b 100644
--- a/model/contract.go
+++ b/model/contract.go
@@ -77,13 +77,13 @@
func (slf *ContractSearch) FindAll() ([]*Contract, int64, error) {
var db = slf.build()
var records = make([]*Contract, 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)
+ }
if slf.PageNum > 0 && slf.PageSize > 0 {
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
--
Gitblit v1.8.0