From 8d159ebd0f91459d25fa5c70b2d284853645c0f8 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 6 Mar 2025 14:38:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AF=BC=E8=88=AA=E6=A0=91/?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E8=BE=93=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/NavigationItem.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/v1/NavigationItem.php b/app/admin/controller/v1/NavigationItem.php
index 44689611..6396bad6 100644
--- a/app/admin/controller/v1/NavigationItem.php
+++ b/app/admin/controller/v1/NavigationItem.php
@@ -38,14 +38,15 @@ class NavigationItem
                 'name',
                 'sort',
                 'blank',
-                'status'
+                'status',
+                'created_at'
             ])
             ->with(['navigation' => function ($query) {
                 $query->field(['id', 'name' => 'nav_name']);
             }])
             ->withSearch(['name', 'created_at'], [
                 'name'       => $param['name']??null,
-                'created_at' => $param['created_at']??null
+                'created_at' => !empty($param['created_at'])? explode(',', $param['created_at']) : null
             ])
             ->navId($param['nav_id']??null)
             ->order(['sort' => 'asc', 'id' => 'asc'])
@@ -64,21 +65,19 @@ class NavigationItem
         $nav = SysNavigationItemModel::field([
                 'id',
                 'pid',
+                'name',
                 'nav_id',
                 'sort',
                 'status',
                 'blank',
-                'created_at'
+                'link_type',
+                'link'
             ])
-            ->with(['navigation' => function ($query) {
-                $query->field(['id', 'name' => 'nav_name']);
-            }])
             ->bypk($id)
             ->find();
         if (empty($nav)) {
             return error('导航不存在');
         }
-        $nav = $nav->bindAttr('navigation', ['nav_name'])->hidden(['nav_id', 'navigation']);
 
         return success('获取成功', $nav);
     }