更新目录结构
This commit is contained in:
@@ -9,8 +9,7 @@
|
||||
namespace app\services\auth;
|
||||
|
||||
use app\model\auth\Permissions;
|
||||
use sent\tree\Tree;
|
||||
use think\facade\Env;
|
||||
use Xin\Support\Arr;
|
||||
|
||||
class MenuService{
|
||||
|
||||
@@ -21,10 +20,9 @@ class MenuService{
|
||||
* @return void
|
||||
*/
|
||||
public function getSystemMenu($is_menu = true, $is_tree = true){
|
||||
$rootid = Env::get('admin_root');
|
||||
$order = "sort asc, id desc";
|
||||
$map = [];
|
||||
if(request()->user['uid'] != $rootid){
|
||||
if(request()->user['uid'] != env('ADMIN')){
|
||||
$map[] = ['name', 'IN', request()->auth()['permission']];
|
||||
}
|
||||
if($is_menu){
|
||||
@@ -37,7 +35,7 @@ class MenuService{
|
||||
$item->hiddenBreadcrumb = (int) $item['hiddenBreadcrumb'];
|
||||
})->toArray();
|
||||
if($is_tree){
|
||||
$menu = (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
|
||||
$menu = Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
|
||||
|
||||
return $menu;
|
||||
}else{
|
||||
|
||||
Reference in New Issue
Block a user