From bbe24137c96c17cd8d481e1dc58d4265ab8a24e8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 08 八月 2023 09:43:50 +0800
Subject: [PATCH] 添加ignore

---
 model/plan.go |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/model/plan.go b/model/plan.go
index e3aee66..a8ccdda 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -26,12 +26,11 @@
 	PlanSearch struct {
 		Plan
 
-				Orm      *gorm.DB
+		Orm      *gorm.DB
 		Keyword  string
 		OrderBy  string
 		PageNum  int
 		PageSize int
-
 	}
 )
 
@@ -79,11 +78,19 @@
 	return record, err
 }
 
-func (slf *PlanSearch) FindAll() ([]*Plan, error) {
+func (slf *PlanSearch) FindAll() ([]*Plan, int64, error) {
 	var db = slf.build()
-	var record = make([]*Plan, 0)
-	err := db.Find(&record).Error
-	return record, err
+	var records = make([]*Plan, 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.Find(&records).Error
+	return records, total, err
 }
 
 func (slf *PlanSearch) SetId(id int) *PlanSearch {

--
Gitblit v1.8.0