Merge branch 'zjl_adjust_check_0125' into 'master'

统计添加权限菜单

See merge request !7

app/Http/Controllers/OrderCountController.php

@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use DB;
 use DB;
 use Cookie;
 use Cookie;
 use App\Http\Page;
 use App\Http\Page;
+use App\Http\Controllers\PermController;
 
 
 function CheckActive($menus, &$arr, $url)
 function CheckActive($menus, &$arr, $url)
 {
 {
@@ -86,6 +87,12 @@ Class OrderCountController extends Controller
         if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
         if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
             $menus = [];
             $menus = [];
 
 
+        $perm = new PermController;
+
+        // 获取权限菜单
+        if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000) 
+            $menus = $perm->getPermMenu($request, $menus); 
+
         $data = [
         $data = [
             'header'    => $request->user->header,
             'header'    => $request->user->header,
             'uri'       => $uri,
             'uri'       => $uri,