From aa5619f405136e065d877a22d928b5af15d1b7ff Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 2 Sep 2025 14:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/SysDictController.php | 13 +++++++++++++
 app/admin/service/SysDictService.php       | 14 ++++++++++++++
 config/route.php                           | 11 ++---------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/SysDictController.php b/app/admin/controller/SysDictController.php
index 34be3e1..3ffef7e 100644
--- a/app/admin/controller/SysDictController.php
+++ b/app/admin/controller/SysDictController.php
@@ -75,4 +75,17 @@ class SysDictController extends BaseController
             return $this->error($e->getMessage());
         }
     }
+
+    public function group(Request $request)
+    {
+        try {
+            $raw = $this->service->group($request);
+            $data = $this->transformData($raw, method_exists($this, 'groupFormat')
+                ? [$this, 'groupFormat']
+                : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/admin/service/SysDictService.php b/app/admin/service/SysDictService.php
index 1ebf167..6d1531d 100644
--- a/app/admin/service/SysDictService.php
+++ b/app/admin/service/SysDictService.php
@@ -87,11 +87,25 @@ class SysDictService
                 $config['with']['sysDictItem'][] = 'item_label';
                 $config['with']['sysDictItem'][] = 'item_value';
                 break;
+            case 'group':
+                $config['order']['id'] = 'desc';
+                $config['where']['id'] = 1;
+                $config['with']['sysDictItem'][] = 'dict_id';
+                $config['with']['sysDictItem'][] = 'item_label';
+                $config['with']['sysDictItem'][] = 'item_value';
+                break;
         }
 
         return $config;
     }
 
+    public function group(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'group');
+        $result = $this->logicListAll($config);
+        return $this->postProcess('group', $result);
+    }
+
 
     public function serviceListAllScope(Request $request)
     {
diff --git a/config/route.php b/config/route.php
index cef6716..2de1e13 100644
--- a/config/route.php
+++ b/config/route.php
@@ -212,6 +212,8 @@ Route::group('/admin', function () {
         Route::any('/update', [app\admin\controller\SysDictController::class, 'update']);
         Route::any('/destroy', [app\admin\controller\SysDictController::class, 'destroy']);
         Route::any('/scope', [app\admin\controller\SysDictController::class, 'listScope']);
+        // 字典分类
+        Route::any('/group', [app\admin\controller\SysDictController::class, 'group']);
 
         Route::group('/item', function () {
             Route::any('/list', [app\admin\controller\SysDictItemController::class, 'index']);
@@ -221,15 +223,6 @@ Route::group('/admin', function () {
             Route::any('/destroy', [app\admin\controller\SysDictItemController::class, 'destroy']);
         });
 
-        // 分类
-        Route::group('/category', function () {
-            Route::any('/list', [app\admin\controller\SysDictCategoryController::class, 'index']);
-            Route::any('/show', [app\admin\controller\SysDictCategoryController::class, 'show']);
-            Route::any('/store', [app\admin\controller\SysDictCategoryController::class, 'store']);
-            Route::any('/update', [app\admin\controller\SysDictCategoryController::class, 'update']);
-            Route::any('/destroy', [app\admin\controller\SysDictCategoryController::class, 'destroy']);
-            Route::any('/preset', [app\admin\controller\SysDictCategoryController::class, 'preset']);
-        });
     });
 
     // 货币