cqp il y a 11 mois
Parent
commit
742b9893be

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

@@ -56,9 +56,9 @@ class CheckLogin
         //该接口是否需要个人部门所有的权限区分
         $request->merge(['is_authority' => $is_authority, 'menu_authority_id' => $menu_id]);
 
-        //某些接口需要传输菜单ID
+        //操作记录传输菜单ID与指向接口
         $menu = $query['menu_option'] ?? [];
-        if(isset($menu[$url])) $request->merge(['menu_id' => $menu[$url]]);
+        if(isset($menu[$url])) $request->merge(['menu_id' => $menu[$url]['menu_id'], 'opt_api_url' => $menu[$url]['url']]);
 
         //写入user信息
         $request->userData = $data;

+ 5 - 6
app/Service/OperationLogService.php

@@ -225,6 +225,7 @@ class OperationLogService extends Service
                 $key_data[$v['key']] = $v['title'];
             }
             $menu_id = $data['menu_id'];
+            $opt_api_url = $data['opt_api_url'];
 
             //创建request副本对象 没有参数让检索出来的数据为空数组
             $result_one['id'] = $data['id'] ?? -1;
@@ -238,7 +239,7 @@ class OperationLogService extends Service
                 $currentRequest->files->all(),
                 []
             );
-            $detail = $this->oaGetData($menu_id, $request);
+            $detail = $this->oaGetData($opt_api_url, $request);
 
             $log = new OperationLog();
             $log->user_id = $user['id'];
@@ -287,15 +288,13 @@ class OperationLogService extends Service
         }
     }
 
-    public function oaGetData($menu_id, $request)
+    public function oaGetData($opt_api_url, $request)
     {
-        $api = SysMenu::where('id', $menu_id)->value('api');
         $path = $this->getMenu();
-        $control = '\\' . $path[$api]["controller"];
-        $act = $path[$api]["act"];
+        $control = '\\' . $path[$opt_api_url]["controller"];
+        $act = $path[$opt_api_url]["act"];
         $new = new $control();
         $detail = $new->$act($request);
-//        if(!isset($detail['data']['data'][0])) $detail['data']['data'][0] = $detail['data'];
         return $detail['data']['data'][0] ?? [];
     }
 

+ 17 - 4
config/morequery.php

@@ -6,10 +6,23 @@ return [
         "api/kqCollect" => 11,
     ],
     "menu_option" => [
-        "api/customerAdd" => 55,
-        "api/customerEdit" => 55,
-        "api/businessOpportunityAdd" => 56,
-        "api/businessOpportunityEdit" => 56,
+        "api/customerAdd" => [
+            'menu_id' => 55,
+            'url' => "api/customerList",
+        ],
+        "api/customerEdit" => [
+            'menu_id' => 55,
+            'url' => "api/customerList",
+        ],
+        "api/businessOpportunityAdd" => [
+            'menu_id' => 56,
+            'url' => "api/businessOpportunityList",
+        ],
+        "api/businessOpportunityEdit" => [
+            'menu_id' => 56,
+            'url' => "api/businessOpportunityList",
+        ],
     ],
+
 ];