|
@@ -147,15 +147,15 @@ class SysMenuService extends Service
|
|
|
->select('title','icon','uri','parent_id','sort','crt_time','id','is_authority')
|
|
|
->orderBy('sort','desc');
|
|
|
//过滤菜单
|
|
|
- $emp = new EmployeeService();
|
|
|
- $menu = $emp->getMenuByRoleInList($user);
|
|
|
- $list->whereIn('id',$menu);
|
|
|
+// $emp = new EmployeeService();
|
|
|
+// $menu = $emp->getMenuByRoleInList($user);
|
|
|
+// $list->whereIn('id',$menu);
|
|
|
$list = $list->get()->toArray();
|
|
|
$return = $this->makeTree(0,$list);
|
|
|
$return = $this->set_sort_circle($return);
|
|
|
}else{
|
|
|
//菜单的按钮
|
|
|
- $return = (new EmployeeService())->getMenuByRole($user);
|
|
|
+// $return = (new EmployeeService())->getMenuByRole($user);
|
|
|
}
|
|
|
|
|
|
return [200, $return];
|