旅程方法修改

app/Service/CustomerService.php

@@ -513,6 +513,7 @@ class CustomerService extends Service
             ->select('title','id','model_type','customer_intention','customer_from','customer_type','car_type','consulting_product','intention_product','progress_stage','address1','address2','crt_id','crt_time','mark','importance','company','company_short_name','depart_id','state_type','customer_state','pond_state','top_depart_id','fp_time','fp_top_depart_id')
             ->orderby('id', 'desc');
 
+        if(! empty($data['id'])) $model->where('id', $data['id']);
         if(! empty($data['my_fz']) || ! empty($data['my_xt'])){
             $id = $this->getCustomerId($data,$user);
             $model->whereIn('id',$id);

app/Service/OperationLogService.php

@@ -194,7 +194,7 @@ class OperationLogService extends Service
     public function setOperationList($data, $user, $type = 1, $menu_id = 18)
     {
 
-        file_put_contents('log.txt', json_encode($data) . PHP_EOL, 8);
+        file_put_contents('log.txt', date('Y-m-d H:i:s') . json_encode($data) . PHP_EOL, 8);
 
         //获取oa参数
         $key = 'menu_id'; // 要匹配的键
@@ -226,17 +226,32 @@ class OperationLogService extends Service
                 $key_data[$v['key']] = $v['title'];
             }
             $menu_id = $data['menu_id'];
-            $param = isset($data['order_number']) ? ['order_number' => $data['order_number']] : ['id' => $data['id']];
-            $request = request();
-            foreach ($param as $k => $v) {
-                $request->$k = $v;
-            }
-            $newUser = new Employee();
-            $newUser = $newUser->fill($user);
-            $request->userData = $newUser;
-            $all = $request->all();
-            if (!isset($all['order_number'])) $request->merge($param);
+//            $param = isset($data['order_number']) ? ['order_number' => $data['order_number']] : ['id' => $data['id']];
+//            $request = request();
+//            foreach ($param as $k => $v) {
+//                $request->$k = $v;
+//            }
+//            $newUser = new Employee();
+//            $newUser = $newUser->fill($user);
+//            $request->userData = $newUser;
+//            $all = $request->all();
+//            if (!isset($all['order_number'])) $request->merge($param);
+
+            //创建request副本对象 没有参数让检索出来的数据为空数组
+            $result_one['id'] = $data['id'] ?? -1;
+            $result_one['order_number'] = $data['order_number'] ?? "-1";
+            $currentRequest = request();
+            $request = $currentRequest->duplicate(
+                $result_one,
+                null,
+                [],
+                $currentRequest->cookies->all(),
+                $currentRequest->files->all(),
+                []
+            );
+            file_put_contents('log.txt', date('Y-m-d H:i:s') . "入参:".json_encode($request->all()) . PHP_EOL, 8);
             $detail = $this->oaGetData($menu_id, $request);
+
             $log = new OperationLog();
             $log->user_id = $user['id'];
             $log->menu_id = $menu_id;
@@ -281,11 +296,9 @@ class OperationLogService extends Service
             return [true, ''];
         } catch (\Exception $e) {
             DB::rollBack();
-            file_put_contents('log.txt', $e->getLine() . $e->getMessage() . PHP_EOL, 8);
+            file_put_contents('log.txt', date('Y-m-d H:i:s') . $e->getCode() . $e->getLine() . $e->getMessage() . PHP_EOL, 8);
             return [false, $e->getLine() . $e->getMessage()];
         }
-
-
     }
 
     public function oaGetData($menu_id, $request)
@@ -297,7 +310,7 @@ class OperationLogService extends Service
         $new = new $control();
         $detail = $new->$act($request);
 //        if(!isset($detail['data']['data'][0])) $detail['data']['data'][0] = $detail['data'];
-        return $detail['data']['data'][0];
+        return $detail['data']['data'][0] ?? [];
     }
 
     public function getMenu()