|
@@ -130,14 +130,14 @@ class SysMenuService extends Service
|
|
|
else $type = '1';
|
|
else $type = '1';
|
|
|
if($type === '1'){
|
|
if($type === '1'){
|
|
|
$return = SysMenu::where('del_time',0)
|
|
$return = SysMenu::where('del_time',0)
|
|
|
- ->select('title','icon','uri','parent_id','sort','crt_time','id')
|
|
|
|
|
|
|
+ ->select('title','icon','uri','parent_id','sort','crt_time','id','is_authority')
|
|
|
->orderBy('sort','desc')
|
|
->orderBy('sort','desc')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
$return = $this->fillMenuButton($return);
|
|
$return = $this->fillMenuButton($return);
|
|
|
}elseif($type === '2'){
|
|
}elseif($type === '2'){
|
|
|
$list = SysMenu::where('del_time',0)
|
|
$list = SysMenu::where('del_time',0)
|
|
|
->where('state',1)
|
|
->where('state',1)
|
|
|
- ->select('title','icon','uri','parent_id','sort','crt_time','id')
|
|
|
|
|
|
|
+ ->select('title','icon','uri','parent_id','sort','crt_time','id','is_authority')
|
|
|
->orderBy('sort','desc');
|
|
->orderBy('sort','desc');
|
|
|
//过滤菜单
|
|
//过滤菜单
|
|
|
$emp = new EmployeeService();
|
|
$emp = new EmployeeService();
|
cqpCow