会员没有全部显示

app/Services/UserService.php

@@ -117,17 +117,21 @@ class UserService extends BaseService
     public static function paginate(array $search = [], $order = 'desc', $by = 'created_at')
     {
         $limit = isset($search['limit']) ? $search['limit'] : 15;
+        $page = isset($search['page']) ? $search['page'] : 1;
+        $where = self::getWhere($search);
+        $total = static::$MODEL::where($where)->count();
         $query = static::$MODEL::with(['wallet','level','agent'])
-            ->join('wallets', 'users.member_id', '=', 'wallets.member_id')
-            ->where(self::getWhere($search));
+            ->leftJoin('wallets', 'users.member_id', '=', 'wallets.member_id')
+            ->where($where);
         if ($by == 'available_balance') $by = "wallets.{$by}";
         else {
             $by = "users.{$by}";
         }
-        $paginator = $query->orderBy($by, $order)
+        $list = $query->orderBy($by, $order)
             ->select("users.*")
-            ->paginate($limit);
-        return ['total' => $paginator->total(), 'data' => $paginator->items()];
+            ->forPage($page, $limit)
+            ->get();
+        return ['total' => $total, 'data' => $list];
     }
 
     //设置游戏ID
@@ -200,4 +204,4 @@ class UserService extends BaseService
         ];
     }
 
-}
+}