|
@@ -44,9 +44,12 @@ class CheckLogin
|
|
|
$data['depart_range'] = EmployeeService::getLoginDepart($result);
|
|
|
//填充菜单
|
|
|
$menu_id = EmployeeService::fillMenu($request);
|
|
|
- $request->merge(['menu_id' => $menu_id]);
|
|
|
$header_default = [];
|
|
|
- if($menu_id) $header_default = config("header." . $menu_id) ?? [];
|
|
|
+ if($menu_id){
|
|
|
+ $request->merge(['menu_id' => $menu_id]);
|
|
|
+ $header_default = config("header." . $menu_id) ?? [];
|
|
|
+ }
|
|
|
+
|
|
|
$data['header_default'] = $header_default;
|
|
|
|
|
|
//写入user信息
|