|
@@ -319,7 +319,7 @@ class MiddleGroundService extends Service
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
|
|
|
$return = $this->fillMenuButton($button,$sysList, $user);
|
|
$return = $this->fillMenuButton($button,$sysList, $user);
|
|
|
- }else{
|
|
|
|
|
|
|
+ }elseif($type == "all"){
|
|
|
$sysList = SysMenu::where('del_time',0)
|
|
$sysList = SysMenu::where('del_time',0)
|
|
|
->where('type', SysMenu::type_one)
|
|
->where('type', SysMenu::type_one)
|
|
|
->select('title','icon','uri','parent_id','sort','id','is_authority', 'state')
|
|
->select('title','icon','uri','parent_id','sort','id','is_authority', 'state')
|
|
@@ -328,6 +328,11 @@ class MiddleGroundService extends Service
|
|
|
->toArray();
|
|
->toArray();
|
|
|
//侧边栏
|
|
//侧边栏
|
|
|
$return = $this->returnTwo($sysList, $user);
|
|
$return = $this->returnTwo($sysList, $user);
|
|
|
|
|
+
|
|
|
|
|
+ $return = [
|
|
|
|
|
+ 'one' => [],
|
|
|
|
|
+ 'two' => $return,
|
|
|
|
|
+ ];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|