From f4cf326a1c68d886e2c17005b50d87406294127f Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 13 Feb 2025 15:38:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=AE=BE=E7=BD=AE=E6=8E=92=E5=BA=8F=E5=80=BC?=
 =?UTF-8?q?=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/ArticleCategory.php   | 30 +++++++++++++++----
 app/admin/route/v1.php                        |  3 ++
 app/common/model/ArticleCategoryBaseModel.php |  4 +--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/admin/controller/v1/ArticleCategory.php b/app/admin/controller/v1/ArticleCategory.php
index 1cce9809..396b647e 100644
--- a/app/admin/controller/v1/ArticleCategory.php
+++ b/app/admin/controller/v1/ArticleCategory.php
@@ -58,8 +58,8 @@ class ArticleCategory
     public function read()
     {
         $id = request()->param('id');
-        $category = ArticleCategoryModel::where('id', '=', $id)
-            ->withoutField(['language_id', 'deleted_at'])
+        $category = ArticleCategoryModel::withoutField(['language_id', 'deleted_at'])
+            ->bypk($id)
             ->find();
         if (is_null($category)) {
             return error('文章分类不存在');
@@ -111,8 +111,8 @@ class ArticleCategory
             return error($valiate->getError());
         }
 
-        $category = ArticleCategoryModel::where('id', '=', $id)->find();
-        if (is_null($category)) {
+        $category = ArticleCategoryModel::bypk($id)->find();
+        if (empty($category)) {
             return error('请确认操作对象是否存在');
         }
         if (!$category->save($data)) {
@@ -122,11 +122,31 @@ class ArticleCategory
         return success('操作成功');
     }
 
+    // 设置排序值
+    public function sort()
+    {
+        $id   = request()->param('id');
+        $sort = request()->post('sort');
+
+        $category = ArticleCategoryModel::bypk($id)->find();
+        if (empty($category)) {
+            return error('请确认操作对象是否存在');
+        }
+        if ($sort != $category->sort) {
+            $category->sort = $sort;
+            if (!$category->save()) {
+                return error('操作失败');
+            }
+        }
+
+        return success('操作成功');
+    }
+
     // 删除分类
     public function delete()
     {
         $id = request()->param('id');
-        $category = ArticleCategoryModel::where('id', '=', $id)->find();
+        $category = ArticleCategoryModel::bypk($id)->find();
         if (is_null($category)) {
             return error('请确认操作对象是否存在');
         }
diff --git a/app/admin/route/v1.php b/app/admin/route/v1.php
index 097ed8c4..823d3b98 100644
--- a/app/admin/route/v1.php
+++ b/app/admin/route/v1.php
@@ -81,6 +81,9 @@ Route::group('v1', function () {
             // 分类更新
             Route::put('update/:id', 'ArticleCategory/update');
 
+            // 设置排序值
+            Route::post('sort/:id', 'ArticleCategory/sort');
+
             // 分类删除
             Route::delete('delete/:id', 'ArticleCategory/delete');
         });
diff --git a/app/common/model/ArticleCategoryBaseModel.php b/app/common/model/ArticleCategoryBaseModel.php
index 834fd35d..b15a6566 100644
--- a/app/common/model/ArticleCategoryBaseModel.php
+++ b/app/common/model/ArticleCategoryBaseModel.php
@@ -3,12 +3,10 @@ declare (strict_types = 1);
 
 namespace app\common\model;
 
-use think\Model;
-
 /**
  * @mixin \think\Model
  */
-class ArticleCategoryBaseModel extends Model
+class ArticleCategoryBaseModel extends BaseModel
 {
     // 表名
     protected $name = 'article_category';