cqp преди 3 месеца
родител
ревизия
ef47ae90cf
променени са 3 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 1 1
      app/Http/Middleware/CheckLogin.php
  2. 1 1
      app/Http/Middleware/CheckWx.php
  3. 2 1
      app/Service/EmployeeService.php

+ 1 - 1
app/Http/Middleware/CheckLogin.php

@@ -41,7 +41,7 @@ class CheckLogin
         //拥有的部门
         //拥有的部门
         $data['depart_range'] = EmployeeService::getLoginDepart($result);
         $data['depart_range'] = EmployeeService::getLoginDepart($result);
         //填充菜单 要权限的地方 列表页字段合计之类
         //填充菜单 要权限的地方 列表页字段合计之类
-        $menu_id = EmployeeService::fillMenu($request);
+        $menu_id = EmployeeService::fillMenu($request,'api/');
         $header_default = [];
         $header_default = [];
         if($menu_id){
         if($menu_id){
             $request->merge(['menu_id' => $menu_id]);
             $request->merge(['menu_id' => $menu_id]);

+ 1 - 1
app/Http/Middleware/CheckWx.php

@@ -58,7 +58,7 @@ class CheckWx
         //拥有的部门
         //拥有的部门
         $data['depart_range'] = EmployeeService::getLoginDepart($employee_id);
         $data['depart_range'] = EmployeeService::getLoginDepart($employee_id);
         //填充菜单 要权限的地方 列表页字段合计之类
         //填充菜单 要权限的地方 列表页字段合计之类
-        $menu_id = EmployeeService::fillMenu($request);
+        $menu_id = EmployeeService::fillMenu($request,'wx/');
         $header_default = [];
         $header_default = [];
         if($menu_id){
         if($menu_id){
             $request->merge(['menu_id' => $menu_id]);
             $request->merge(['menu_id' => $menu_id]);

+ 2 - 1
app/Service/EmployeeService.php

@@ -1261,8 +1261,9 @@ class EmployeeService extends Service
         return $depart;
         return $depart;
     }
     }
 
 
-    public static function fillMenu($request){
+    public static function fillMenu($request, $str){
         $url = $request->path();
         $url = $request->path();
+        $url = str_replace($str,'', $url);
 
 
         // 直接查询匹配的菜单
         // 直接查询匹配的菜单
         $menuItem = SysMenu::where('del_time',0)
         $menuItem = SysMenu::where('del_time',0)