运输管理-导出BUG修复

app/Http/Controllers/WaybillsController.php

@@ -626,13 +626,12 @@ class WaybillsController extends Controller
 
     public function waybillExport($id,Request $request){
         if(!Gate::allows('运输管理-查询')){ return '没有权限';  }
+        ini_set('max_execution_time',2500);
+        ini_set('memory_limit','1526M');
         $waybills=Waybill::with(['owner', 'waybillAuditLogs' => function ($query) {
-            return $query->with('user');
+            $query->with('user');
         }]);
         if ($id==-1){
-            $id=[];
-            ini_set('max_execution_time',2500);
-            ini_set('memory_limit','1526M');
             $waybills=$this->conditionQuery($request,$waybills);
             $waybills=$waybills->get();
         }else {
@@ -703,7 +702,6 @@ class WaybillsController extends Controller
             }
             $list[$i]=$w;
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
         return Excel::download(new Export($row,$list), date('Y:m:d ') . '运单列表.xlsx');
     }