|
@@ -83,11 +83,11 @@ class Menu extends Controller
|
|
|
'icon' => 'nullable|string',
|
|
'icon' => 'nullable|string',
|
|
|
'sort' => 'required|nullable|integer',
|
|
'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'];
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (empty($id)) {
|
|
|
|
|
+ $validator['parent_id'] = ['required', 'integer', 'min:0'];
|
|
|
|
|
+ $validator['uri'] = ['required', 'string', 'max:200'];
|
|
|
|
|
+ $validator['type'] = ['required', 'integer', 'in:1,2'];
|
|
|
|
|
+ }
|
|
|
$params = request()->validate($validator);
|
|
$params = request()->validate($validator);
|
|
|
$ret = MenuService::submit($params);
|
|
$ret = MenuService::submit($params);
|
|
|
if ($ret['code'] == BaseService::NOT) {
|
|
if ($ret['code'] == BaseService::NOT) {
|
|
@@ -153,7 +153,7 @@ class Menu extends Controller
|
|
|
$result = $result->toArray();
|
|
$result = $result->toArray();
|
|
|
$result = list_to_tree($result);
|
|
$result = list_to_tree($result);
|
|
|
$newArr = [];
|
|
$newArr = [];
|
|
|
- $this->treeToList($result,$newArr);
|
|
|
|
|
|
|
+ $this->treeToList($result, $newArr);
|
|
|
$result = $newArr;
|
|
$result = $newArr;
|
|
|
foreach ($result as &$k) {
|
|
foreach ($result as &$k) {
|
|
|
unset($k['children']);
|
|
unset($k['children']);
|
Ken