临时工报表分页问题

app/Services/LaborReportService.php

@@ -33,14 +33,14 @@ class LaborReportService
                 $builder->select('enter_number')->from('labor_reports')
                     ->leftJoin('labor_report_statuses','labor_reports.id','labor_report_statuses.labor_report_id')
                     ->where('labor_report_statuses.status','已退场');
-                if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
-                    $builder->where('labor_report_statuses.created_at','like',date('Y-m-d').'%');
-                }
+//                if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
+//                    $builder->where('labor_report_statuses.created_at','like',date('Y-m-d').'%');
+//                }
             });
         }else unset($params['is_export']);
-        if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
-            $laborReports->where('labor_reports.created_at','like',date('Y-m-d').'%');
-        }
+//        if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
+//            $laborReports->where('labor_reports.created_at','like',date('Y-m-d').'%');
+//        }
         $columnQueryRules=[
             'enter_number' => ['timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
@@ -60,7 +60,7 @@ class LaborReportService
         return $laborReports;
     }
     public function paginate(array $params){
-        return $this->conditionQuery($params)->paginate($request->paginate ?? 50);
+        return $this->conditionQuery($params)->paginate($params['paginate'] ?? 50);
     }
     public function get(array $params){
         return $this->conditionQuery($params)->without("userDutyCheck")->get();