1

app/Service/OperationLogService.php

@@ -180,7 +180,8 @@ class OperationLogService extends Service
 
         //获取oa参数
         $key = 'menu_id'; // 要匹配的键
-        $value = $menu_id; // 要匹配的值
+//        $value = $menu_id; // 要匹配的值
+        $value = $data['menu_id'];
 
         $result = array_filter(config('oa'), function ($array) use ($key, $value) {
             return $array[$key] == $value;
@@ -210,7 +211,9 @@ class OperationLogService extends Service
             foreach ($param as $k => $v) {
                 $request->$k = $v;
             }
-            $request->userData = $user;
+            $newUser = new Employee();
+            $newUser = $newUser->fill($user);
+            $request->userData = $newUser;
             $all = $request->all();
             if (!isset($all['order_number'])) $request->merge($param);
             $detail = $this->oaGetData($menu_id, $request);
@@ -223,15 +226,22 @@ class OperationLogService extends Service
             $log->save();
             $id = $log->id;
             $bind_data_detail = [];
+
             //以下是对比逻辑
             foreach ($data as $k => $v) {
 
                 if (isset($detail[$k]) && isset($key_data[$k]) ) {
                     $pattern = '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/';
+                    $pattern1 = '/^\d{4}-\d{2}-\d{2}$/';
                     if (preg_match($pattern, $detail[$k])) {
+                        continue;
+                        $detail[$k] = strtotime($detail[$k]);
+                    }elseif (preg_match($pattern1, $detail[$k])) {
+                        continue;
                         $detail[$k] = strtotime($detail[$k]);
                     }
                     if (preg_match($pattern, $v)) {
+                        continue;
                         $v = strtotime($v);
                     }
                     if($v != $detail[$k]){