youfeng

app/Http/Middleware/CheckLogin.php

@@ -43,7 +43,11 @@ class CheckLogin
         //拥有的部门
         $data['depart_range'] = EmployeeService::getLoginDepart($result);
         //填充菜单
-        EmployeeService::fillMenu( $request);
+        $menu_id = EmployeeService::fillMenu( $request);
+        $request->merge(['menu_id' => $menu_id]);
+        $header_default = [];
+        if($menu_id) $header_default = config("header." . $menu_id) ?? [];
+        $data['header_default'] = $header_default;
 
         //写入user信息
         $request->userData = $data;

app/Service/EmployeeService.php

@@ -1289,7 +1289,7 @@ class EmployeeService extends Service
         return $depart;
     }
 
-    public static function fillMenu(&$request){
+    public static function fillMenu($request){
         $menu = SysMenu::where('del_time',0)
             ->where('api_list','<>','')
             ->pluck('id','api_list')
@@ -1300,7 +1300,8 @@ class EmployeeService extends Service
         //菜单ID
         $menu_id = 0;
         if(isset($menu[$url])) $menu_id = $menu[$url];
-        $request->merge(['menu_id' => $menu_id]);
+
+        return $menu_id;
     }
 
     /**

app/Service/HeaderWord/HeaderWordHookService.php

@@ -41,13 +41,13 @@ class HeaderWordHookService extends Service
     }
 
     public function getHeaderSettings($data){
-        if($this->isEmpty($data,'menu_id')) return [false,'菜单ID不能为空！'];
-        $type = 1;
-        if(! $this->isEmpty($data,'type')) $type = $data['type'];
-
-        $header = config("header.{$data['menu_id']}")[$type] ?? [];
-
-        return [true,$header];
+//        if($this->isEmpty($data,'menu_id')) return [false,'菜单ID不能为空！'];
+//        $type = 1;
+//        if(! $this->isEmpty($data,'type')) $type = $data['type'];
+//
+//        $header = config("header.{$data['menu_id']}")[$type] ?? [];
+//
+//        return [true,$header];
     }
 
     public function edit($data){

app/Service/StatisticsService.php

@@ -37,8 +37,7 @@ class StatisticsService extends Service
         $list = $this->limit($model,'',$data);
         $list = $this->statisticsRevenueCostFillData($list);
 
-        $header_default = config("header.68") ?? [];
-        $list['count'] = $this->countTotal($list['data'], $header_default);
+        $list['count'] = $this->countTotal($list['data'], $user['header_default']);
         return [true, $list];
     }
 
@@ -90,12 +89,7 @@ class StatisticsService extends Service
         $list = $this->limit($model,'',$data);
         $list = $this->statisticsRevenueCostOneAndTwoFillData($list);
 
-        if($data['order_type'] == 1){
-            $header_default = config("header.69") ?? [];
-        }else{
-            $header_default = config("header.70") ?? [];
-        }
-        $list['count'] = $this->countTotal($list['data'], $header_default);
+        $list['count'] = $this->countTotal($list['data'], $user['header_default']);
 
         return [true, $list];
     }
@@ -145,8 +139,7 @@ class StatisticsService extends Service
         $list = $this->limit($model,'',$data);
         $list = $this->statisticsRevenueCostThreeFillData($list);
 
-        $header_default = config("header.71") ?? [];
-        $list['count'] = $this->countTotal($list['data'], $header_default);
+        $list['count'] = $this->countTotal($list['data'], $user['header_default']);
 
         return [true, $list];
     }