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); }