update

app/Http/Controllers/admin/Menu.php

@@ -84,9 +84,9 @@ class Menu extends Controller
                 'sort' => 'required|nullable|integer',
             ];
 //            if (empty($id)) {
-                $validator['parent_id'] = ['required', 'integer', 'min:0'];
-                $validator['uri'] = ['required', 'string', 'max:200'];
-                $validator['type'] = ['required', 'integer', 'in:1,2'];
+            $validator['parent_id'] = ['required', 'integer', 'min:0'];
+            $validator['uri'] = ['required', 'string', 'max:200'];
+            $validator['type'] = ['required', 'integer', 'in:1,2'];
 //            }
             $params = request()->validate($validator);
             $ret = MenuService::submit($params);
@@ -148,33 +148,12 @@ class Menu extends Controller
      */
     public function all()
     {
-        $search = request()->all();
-        $result = MenuService::findAll($search);
-        $result = $result->toArray();
-        $result = list_to_tree($result);
-//        $newArr = [];
-//        $this->treeToList($result, $newArr);
-//        $result = $newArr;
-//        foreach ($result as &$k) {
-//            unset($k['children']);
-//        }
+        $result = MenuService::findAll();
+        $result = list_to_tree($result->toArray());
         return $this->success($result);
     }
 
 
-    private function treeToList($result, &$newArr = [])
-    {
-        foreach ($result as $item) {
-            $data = $item;
-//            unset($data['children']);
-            $newArr[] = $data;
-            if (isset($item['children']) && count($item['children']) > 0) {
-                $this->treeToList($item['children'], $newArr);
-            }
-        }
-    }
-
-
     /**
      * @api {get} /admin/menu/mineMenu 我的菜单
      * @apiGroup 菜单管理