|
@@ -63,7 +63,7 @@ class Menu extends Controller
|
|
|
* @apiUse header
|
|
* @apiUse header
|
|
|
* @apiVersion 1.0.0
|
|
* @apiVersion 1.0.0
|
|
|
*
|
|
*
|
|
|
- * @apiParam {int} id 菜单ID
|
|
|
|
|
|
|
+ * @apiParam {int} id 菜单ID
|
|
|
* @apiParam {string} title 菜单名称
|
|
* @apiParam {string} title 菜单名称
|
|
|
* @apiParam {string} [uri] 菜单链接地址/路由
|
|
* @apiParam {string} [uri] 菜单链接地址/路由
|
|
|
* @apiParam {string} [parent_id] 父级菜单ID
|
|
* @apiParam {string} [parent_id] 父级菜单ID
|
|
@@ -148,6 +148,7 @@ class Menu extends Controller
|
|
|
{
|
|
{
|
|
|
$search = request()->all();
|
|
$search = request()->all();
|
|
|
$result = MenuService::findAll($search);
|
|
$result = MenuService::findAll($search);
|
|
|
|
|
+ $result = list_to_tree($result);
|
|
|
return $this->success($result);
|
|
return $this->success($result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -220,12 +221,12 @@ class Menu extends Controller
|
|
|
public function check()
|
|
public function check()
|
|
|
{
|
|
{
|
|
|
$userId = request()->user->id;
|
|
$userId = request()->user->id;
|
|
|
- $uri = request()->post('uri','');
|
|
|
|
|
- $result = MenuService::checkMenu($userId,$uri);
|
|
|
|
|
- if($result){
|
|
|
|
|
|
|
+ $uri = request()->post('uri', '');
|
|
|
|
|
+ $result = MenuService::checkMenu($userId, $uri);
|
|
|
|
|
+ if ($result) {
|
|
|
return $this->success($result, '有权限访问');
|
|
return $this->success($result, '有权限访问');
|
|
|
- }else{
|
|
|
|
|
- return $this->error(99,'没有权限访问',$result);
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return $this->error(99, '没有权限访问', $result);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|