From 7ea4c5fd4f58a744ab6d563d9410be3f63a0e1b2 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Mon, 13 Jan 2025 17:07:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=8F=8A=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Article.php         | 25 +++++++++++++--------
 app/admin/controller/v1/ArticleCategory.php | 14 ++++++++----
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/admin/controller/v1/Article.php b/app/admin/controller/v1/Article.php
index a234c0ec..d9b3aadc 100644
--- a/app/admin/controller/v1/Article.php
+++ b/app/admin/controller/v1/Article.php
@@ -12,9 +12,9 @@ class Article
     public function index()
     {
         $param = request()->param([
-            'title'       => '',
-            'category_id' => 0,
-            'created_at'  => '',
+            'title',
+            'category_id',
+            'created_at',
             'page/d'      => 1,
             'limit/d'     => 10,
         ]);
@@ -33,11 +33,16 @@ class Article
                 'seo_keywords',
                 'seo_desc'
             ])
-            ->category($param['category_id'])
+            ->where(function($query) use($param) {
+                if (isset($param['category_id'])) {
+                    $query->category($param['category_id']);
+                }
+            })
             ->withSearch(['title', 'created_at'], (function() use($param) {
-                $condition = [
-                    'title' => $param['title'],
-                ];
+                $condition = [];
+                if (isset($param['title'])) {
+                    $condition['title'] = $param['title'];
+                }
                 if (isset($param['created_at'])) {
                     $condition = [
                         'created_at' => explode(',', $param['created_at'])
@@ -46,8 +51,10 @@ class Article
                 return $condition;
             })())
             ->order('sort', 'desc')
-            ->page($param['page'], $param['limit'])
-            ->select();
+            ->paginate([
+                'page'      => $param['page'],
+                'list_rows' => $param['limit'],
+            ]);
 
         return success('获取成功', $article);
     }
diff --git a/app/admin/controller/v1/ArticleCategory.php b/app/admin/controller/v1/ArticleCategory.php
index 478e81fc..7195ea9b 100644
--- a/app/admin/controller/v1/ArticleCategory.php
+++ b/app/admin/controller/v1/ArticleCategory.php
@@ -12,7 +12,7 @@ class ArticleCategory
     public function index()
     {
         $param = request()->param([
-            'name'    => '',
+            'name',
             'page/d'  => 1,
             'limit/d' => 10,
         ]);
@@ -24,10 +24,16 @@ class ArticleCategory
                 'seo_keywords',
                 'seo_desc',
             ])
-            ->withSearch(['name'], ['name' => $param['name']])
+            ->where(function($query) use($param) {
+                if (isset($param['name'])) {
+                    $query->withSearch(['name'], ['name' => $param['name']]);
+                }
+            })
             ->order('sort', 'asc')
-            ->page($param['page'], $param['limit'])
-            ->select();
+            ->paginate([
+                'page'      => $param['page'],
+                'list_rows' => $param['limit']
+            ]);
 
         return success('获取成功', $category);
     }