u

app/Services/BackflowService.php

@@ -72,23 +72,19 @@ class BackflowService extends BaseService
 
     public static function paginate(array $search = []): array
     {
-
-
         $page = request()->input('page', 1);
         $limit = request()->input('limit', 10);
         $date = Carbon::now('Asia/Shanghai')->format('Y-m');
-        $query = static::$MODEL::where(static::getWhere($search))//            ->where('date', '<', $date)
-        ;
+        $query = static::$MODEL::where(static::getWhere($search))
+            ->where('date', '<', $date);
         if (isset($search['username']) && !empty($search['username'])) {
             $username = $search['username'];
             $query = $query->whereHas('user', function ($query1) use ($username) {
                 $query1->where('username', $username);
             });
         }
-        $count = $query->count();
         $query->with(['user'])->orderByDesc('date')->orderBy('status');
-        $list = $query->forPage($page, $limit)->get()->toArray();
-
-        return ['total' => $count, 'data' => $list];
+        $paginator = $query->paginate($limit);
+        return ['total' => $paginator->total(), 'data' => $paginator->items()];
     }
 }