|
|
@@ -304,20 +304,46 @@ class MiddleGroundService extends Service
|
|
|
|
|
|
// 菜单
|
|
|
public function menuList($data, $user){
|
|
|
- $sysList = SysMenu::where('del_time',0)
|
|
|
- ->select('title','icon','uri','parent_id','sort','id','is_authority', 'state')
|
|
|
- ->orderBy('sort','desc')
|
|
|
- ->get()
|
|
|
- ->toArray();
|
|
|
- $button = SysMenuButton::where('del_time',0)
|
|
|
- ->select('id','title','sort','func','menu_id')
|
|
|
- ->get()->toArray();
|
|
|
+ $type = $data['type'] ?? "";
|
|
|
+
|
|
|
+ if(empty($type)){
|
|
|
+ //权限
|
|
|
+ $sysList = SysMenu::where('del_time',0)
|
|
|
+ ->where('type', SysMenu::type_zero)
|
|
|
+ ->select('title','icon','uri','parent_id','sort','id','is_authority', 'state')
|
|
|
+ ->orderBy('sort','desc')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
+ $button = SysMenuButton::where('del_time',0)
|
|
|
+ ->select('id','title','sort','func','menu_id')
|
|
|
+ ->get()->toArray();
|
|
|
+
|
|
|
+ $return = $this->fillMenuButton($button,$sysList, $user);
|
|
|
+ }else{
|
|
|
+ $sysList = SysMenu::where('del_time',0)
|
|
|
+ ->where('type', SysMenu::type_one)
|
|
|
+ ->select('title','icon','uri','parent_id','sort','id','is_authority', 'state')
|
|
|
+ ->orderBy('sort','desc')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
+ //侧边栏
|
|
|
+ $return = $this->returnTwo($sysList, $user);
|
|
|
+ }
|
|
|
|
|
|
- $return = $this->fillMenuButton($button,$sysList, $user);
|
|
|
|
|
|
return [true, $return];
|
|
|
}
|
|
|
|
|
|
+ private function returnTwo($sysList, $user){
|
|
|
+ foreach ($sysList as $key => $value){
|
|
|
+ if($value['state'] <= 0) unset($sysList[$key]);
|
|
|
+ }
|
|
|
+ $list = array_values($sysList);
|
|
|
+ $return = $this->makeTree(0,$list);
|
|
|
+
|
|
|
+ return $this->set_sort_circle($return);;
|
|
|
+ }
|
|
|
+
|
|
|
public function fillMenuButton($button, $menu, $user)
|
|
|
{
|
|
|
// 1. 预处理所有按钮池(合并配置中的特殊按钮)
|