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/salesReturn.go      |    6 +-
 model/plan.go             |    6 +-
 model/salesLeads.go       |    6 +-
 model/contract.go         |    6 +-
 model/saleChance.go       |    6 +-
 model/quotation.go        |    6 +-
 model/contact.go          |   10 ++--
 model/masterOrder.go      |    6 +-
 model/orderManage.go      |    6 +-
 model/serviceFollowup.go  |    6 +-
 model/serviceContract.go  |    8 ++--
 model/salesDetails.go     |    6 +-
 model/serviceFeeManage.go |    6 +-
 model/salesRefund.go      |    6 +-
 model/subOrder.go         |    6 +-
 15 files changed, 48 insertions(+), 48 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
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)
diff --git a/model/masterOrder.go b/model/masterOrder.go
index b50833f..71f053e 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -80,13 +80,13 @@
 func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, int64, error) {
 	var db = slf.build()
 	var records = make([]*MasterOrder, 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)
diff --git a/model/orderManage.go b/model/orderManage.go
index e625f4a..2712759 100644
--- a/model/orderManage.go
+++ b/model/orderManage.go
@@ -79,13 +79,13 @@
 func (slf *OrderManageSearch) FindAll() ([]*OrderManage, int64, error) {
 	var db = slf.build()
 	var records = make([]*OrderManage, 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").Find(&records).Error
 	return records, total, err
diff --git a/model/plan.go b/model/plan.go
index 5a71fef..a8ccdda 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -81,13 +81,13 @@
 func (slf *PlanSearch) FindAll() ([]*Plan, int64, error) {
 	var db = slf.build()
 	var records = make([]*Plan, 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.Find(&records).Error
 	return records, total, err
diff --git a/model/quotation.go b/model/quotation.go
index 05a1374..2999797 100644
--- a/model/quotation.go
+++ b/model/quotation.go
@@ -85,13 +85,13 @@
 func (slf *QuotationSearch) FindAll() ([]*Quotation, int64, error) {
 	var db = slf.build()
 	var records = make([]*Quotation, 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.Find(&records).Error
 	return records, total, err
diff --git a/model/saleChance.go b/model/saleChance.go
index 5060be3..320cafb 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -106,13 +106,13 @@
 func (slf *SaleChanceSearch) FindAll() ([]*SaleChance, int64, error) {
 	var db = slf.build()
 	var records = make([]*SaleChance, 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
diff --git a/model/salesDetails.go b/model/salesDetails.go
index 122c993..dbcaa26 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -94,13 +94,13 @@
 func (slf *SalesDetailsSearch) FindAll() ([]*SalesDetails, int64, error) {
 	var db = slf.build()
 	var records = make([]*SalesDetails, 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)
diff --git a/model/salesLeads.go b/model/salesLeads.go
index 736c35a..dfe8e2d 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -116,13 +116,13 @@
 func (slf *SalesLeadsSearch) FindAll() ([]*SalesLeads, int64, error) {
 	var db = slf.build()
 	var records = make([]*SalesLeads, 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").Find(&records).Error
 	return records, total, err
diff --git a/model/salesRefund.go b/model/salesRefund.go
index d0f1579..e34be5b 100644
--- a/model/salesRefund.go
+++ b/model/salesRefund.go
@@ -80,13 +80,13 @@
 func (slf *SalesRefundSearch) FindAll() ([]*SalesRefund, int64, error) {
 	var db = slf.build()
 	var records = make([]*SalesRefund, 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)
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 6c212d8..94e1232 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -77,13 +77,13 @@
 func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, int64, error) {
 	var db = slf.build()
 	var records = make([]*SalesReturn, 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("Products").Find(&records).Error
 	return records, total, err
diff --git a/model/serviceContract.go b/model/serviceContract.go
index d807f81..fd9dbb0 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -89,12 +89,12 @@
 func (slf *ServiceContractSearch) FindAll() ([]*ServiceContract, int64, error) {
 	var db = slf.build()
 	var records = make([]*ServiceContract, 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 {
@@ -123,4 +123,4 @@
 func (slf *ServiceContractSearch) SetOrder(order string) *ServiceContractSearch {
 	slf.OrderBy = order
 	return slf
-}
+}
\ No newline at end of file
diff --git a/model/serviceFeeManage.go b/model/serviceFeeManage.go
index 6d3d36b..16b6ab4 100644
--- a/model/serviceFeeManage.go
+++ b/model/serviceFeeManage.go
@@ -89,13 +89,13 @@
 func (slf *ServiceFeeManageSearch) FindAll() ([]*ServiceFeeManage, int64, error) {
 	var db = slf.build()
 	var records = make([]*ServiceFeeManage, 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)
diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index 1c95427..c6baa40 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -85,13 +85,13 @@
 func (slf *ServiceFollowupSearch) FindAll() ([]*ServiceFollowup, int64, error) {
 	var db = slf.build()
 	var records = make([]*ServiceFollowup, 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)
diff --git a/model/subOrder.go b/model/subOrder.go
index 3914981..42bb6eb 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -74,13 +74,13 @@
 func (slf *SubOrderSearch) FindAll() ([]*SubOrder, int64, error) {
 	var db = slf.build()
 	var records = make([]*SubOrder, 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("Products").Preload("Client").Find(&records).Error
 	return records, total, err

--
Gitblit v1.8.0