Commit 6fff29ed by 朱继来

Merge branch 'zjl_adjust_20181026' into development

parents cbbc3f46 092d0dbb
......@@ -90,9 +90,13 @@ Class AddOrderController extends Controller
$perm = new PermController;
// 用户角色
$role = $perm->getUserRole($request);
// 获取权限菜单
if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000)
$menus = $perm->getPermMenu($request, $menus);
if ($role != 1) {
$menus = $perm->getPermMenu($menus, $request->user->userId);
}
$data = [
'header' => $request->user->header,
......
......@@ -324,9 +324,13 @@ Class OrderController extends Controller
$perm = new PermController;
// 用户角色
$role = $perm->getUserRole($request);
// 获取权限菜单
if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000)
$menus = $perm->getPermMenu($request, $menus);
if ($role != 1) {
$menus = $perm->getPermMenu($menus, $request->user->userId);
}
$data = [
'header' => $request->user->header,
......
......@@ -89,9 +89,13 @@ Class OrderCountController extends Controller
$perm = new PermController;
// 用户角色
$role = $perm->getUserRole($request);
// 获取权限菜单
if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000)
$menus = $perm->getPermMenu($request, $menus);
if ($role != 1) {
$menus = $perm->getPermMenu($menus, $request->user->userId);
}
$data = [
'header' => $request->user->header,
......
......@@ -69,9 +69,13 @@ class WebController extends Controller
$perm = new PermController();
// 用户角色
$role = $perm->getUserRole($request);
// 获取权限菜单
if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000)
$menus = $perm->getPermMenu($request, $menus);
if ($role != 1) {
$menus = $perm->getPermMenu($menus, $request->user->userId);
}
$data = [
'header' => $request->user->header,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment