u

app/Http/Controllers/admin/User.php

@@ -64,7 +64,7 @@ class User extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'first_name' => ['nullable', 'string', 'min:1'],
+                'like_first_name' => ['nullable', 'string', 'min:1'],
                 'username' => ['nullable', 'string', 'min:1'],
                 'register_ip' => ['nullable', 'string', 'min:1'],
             ]);

app/Services/UserService.php

@@ -46,29 +46,24 @@ class UserService extends BaseService
     {
         $where = [];
         if (isset($search['id']) && !empty($search['id'])) {
-            $where[] = ['id', '=', $search['id']];
+            $where[] = ['users.id', '=', $search['id']];
         }
 
         if (isset($search['register_ip']) && !empty($search['register_ip'])) {
-            $where[] = ['register_ip', '=', $search['register_ip']];
+            $where[] = ['users.register_ip', '=', $search['register_ip']];
         }
 
-        if (isset($search['game_id']) && !empty($search['game_id'])) {
-            $where[] = ['game_id', '=', $search['game_id']];
-        }
-
-
         if (isset($search['member_id']) && !empty($search['member_id'])) {
-            $where[] = ['member_id', '=', $search['member_id']];
+            $where[] = ['users.member_id', '=', $search['member_id']];
         }
         if (isset($search['first_name']) && !empty($search['first_name'])) {
-            $where[] = ['first_name', '=', $search['first_name']];
+            $where[] = ['users.first_name', '=', $search['first_name']];
         }
         if (isset($search['username']) && !empty($search['username'])) {
-            $where[] = ['username', '=', $search['username']];
+            $where[] = ['users.username', '=', $search['username']];
         }
         if (isset($search['like_first_name']) && !empty($search['like_first_name'])) {
-            $where[] = ['first_name', 'like', "%" . $search['like_first_name'] . "%"];
+            $where[] = ['users.first_name', 'like', "%" . $search['like_first_name'] . "%"];
         }
         return $where;
     }