fix

app/Http/Services/LogService.php

@@ -30,7 +30,7 @@ class LogService
     }
     }
 
 
     //批量添加日志
     //批量添加日志
-    public function BatchAddLogs($supplierIds,$type,$action,$content,$remark = '')
+    public function BatchAddLogs($supplierIds, $type, $action, $content, $remark = '')
     {
     {
         $adminId = request()->user->userId;
         $adminId = request()->user->userId;
         $adminName = request()->user->name;
         $adminName = request()->user->name;
@@ -51,7 +51,7 @@ class LogService
         return $model->insert($data);
         return $model->insert($data);
     }
     }
 
 
-    public function BatchAddIgnoreAuditLogs($supplierIds,$type,$action,$content,$remark = '')
+    public function BatchAddIgnoreAuditLogs($supplierIds, $type, $action, $content, $remark = '')
     {
     {
         $adminId = request()->user->userId;
         $adminId = request()->user->userId;
         $adminName = request()->user->name;
         $adminName = request()->user->name;
@@ -76,8 +76,8 @@ class LogService
     //添加忽略审核的日志
     //添加忽略审核的日志
     public function AddIgnoreAuditCheckLog($supplierId, $type, $action, $content, $remark = '')
     public function AddIgnoreAuditCheckLog($supplierId, $type, $action, $content, $remark = '')
     {
     {
-        $adminId = request()->user->userId;
-        $adminName = request()->user->name;
+        $adminId = isset(request()->user->userId) ? request()->user->userId : 1000;
+        $adminName = isset(request()->user->name) ? request()->user->name : 'admin';
         $data = [
         $data = [
             'supplier_id' => $supplierId,
             'supplier_id' => $supplierId,
             'type' => $type,
             'type' => $type,
@@ -181,8 +181,8 @@ class LogService
                 if ($key == 'extra_fee') {
                 if ($key == 'extra_fee') {
                     $oldFee = json_decode($oldSupplier['extra_fee'], true);
                     $oldFee = json_decode($oldSupplier['extra_fee'], true);
                     $newFee = json_decode($newSupplier['extra_fee'], true);
                     $newFee = json_decode($newSupplier['extra_fee'], true);
-                    if (empty($oldFee['cn']) ||empty($oldFee['hk']) || empty($newFee['cn']) || empty($newFee['hk'])) {
-//                        $content = '采购附加费修改';
+                    if (empty($oldFee['cn']) || empty($oldFee['hk']) || empty($newFee['cn']) || empty($newFee['hk'])) {
+                        //                        $content = '采购附加费修改';
                         $content = '';
                         $content = '';
                     } else {
                     } else {
                         $content = "采购附加费由 [商品总价不满" . $oldFee['cn']['max'] . "元,收取" . $oldFee['cn']['price'] . "元;商品总价不满" .
                         $content = "采购附加费由 [商品总价不满" . $oldFee['cn']['max'] . "元,收取" . $oldFee['cn']['price'] . "元;商品总价不满" .
@@ -254,6 +254,4 @@ class LogService
 
 
         return $desc;
         return $desc;
     }
     }
-
-
 }
 }