Ken 4 dni temu
rodzic
commit
6c5f7a5404
1 zmienionych plików z 7 dodań i 4 usunięć
  1. 7 4
      app/Services/BackflowService.php

+ 7 - 4
app/Services/BackflowService.php

@@ -79,10 +79,9 @@ class BackflowService extends BaseService
 //            ->where('date', '<', $date)
 
 
-
         if (isset($search['username']) && !empty($search['username'])) {
             $username = $search['username'];
-             $query->whereHas('member', function ($query1) use ($username) {
+            $query->whereHas('member', function ($query1) use ($username) {
                 $query1->where('username', $username);
             });
         }
@@ -92,7 +91,11 @@ class BackflowService extends BaseService
             ->orderByDesc('date')
             ->orderBy('status');
 
-        $paginator = $query->paginate($limit);
-        return ['total' => $paginator->total(), 'data' => $paginator->items()];
+//        $paginator = $query->paginate($limit);
+
+        $total = $query->count();
+        $list = $query->get()->toArray();
+
+        return ['total' => $total, 'data' => $list];
     }
 }