update paginate

1.4.0/model/find-one.tpl

@@ -138,7 +138,7 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
     }{}
 
 	err := m.QueryCtx(ctx, &pagination, {{.cacheKeyVariable}}, func(conn *gorm.DB, v interface{}) error {
-	    db := conn.Model(&{{.upperStartCamelObject}}{})
+	    db := conn.Model(&{{.upperStartCamelObject}}{}).Where(where)
         if len(columns) > 0 {
             db = db.Select(columns)
         }
@@ -146,9 +146,13 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
         if order != "" {
             db = db.Order(order)
         }
-        err := db.Count(&pagination.Total).Error
-        if err == nil {
-            return err
+        err := db.Count(&total).Error
+        if err != nil {
+            return list, total, err
+        }
+
+        if total == 0 {
+            return list, total, nil
         }
 
         if page == 0 {
@@ -162,7 +166,7 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
 
         offset := (page - 1) * pageSize
         db = db.Offset(offset).Limit(pageSize)
-        return db.Find(&pagination.List, where).Error
+        return db.Find(&pagination.List).Error
     })
     if err == nil {
         return pagination.List, pagination.Total, nil
@@ -175,7 +179,7 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
     var list []*{{.upperStartCamelObject}}
     var total int64
 
-    db := m.conn.WithContext(ctx).Model(&{{.upperStartCamelObject}}{})
+    db := m.conn.WithContext(ctx).Model(&{{.upperStartCamelObject}}{}).Where(where)
     if len(columns) > 0 {
         db = db.Select(columns)
     }
@@ -184,7 +188,11 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
         db = db.Order(order)
     }
     err := db.Count(&total).Error
-    if err == nil {
+    if err != nil {
+        return list, total, err
+    }
+
+    if total == 0 {
         return list, total, nil
     }
 
@@ -199,7 +207,7 @@ func (m *default{{.upperStartCamelObject}}Model) Paginate(ctx context.Context, w
 
     offset := (page - 1) * pageSize
     db = db.Offset(offset).Limit(pageSize)
-    err = db.Find(&list, where).Error
+    err = db.Find(&list).Error
     if err == nil {
         return list, total, nil
     } else if errors.Is(err, gorm.ErrRecordNotFound) {