浏览代码

得润宝

cqp 2 周之前
父节点
当前提交
0ebe63422f
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      app/Http/Controllers/Api/SysMenuController.php
  2. 4 4
      app/Service/SysMenuService.php

+ 1 - 1
app/Http/Controllers/Api/SysMenuController.php

@@ -49,7 +49,7 @@ class SysMenuController extends BaseController
     public function menuList(Request $request)
     {
         $service = new SysMenuService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->menuList($request->all(),$user);
 
         if($status){

+ 4 - 4
app/Service/SysMenuService.php

@@ -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];