u

app/Http/Controllers/admin/Keyboard.php

@@ -41,11 +41,14 @@ class Keyboard extends Controller
     public function index()
     {
         try {
-            request()->validate([
-                'title' => ['nullable', 'string'],
-                'permission_name' => ['nullable', 'string'],
+            $search = request()->validate([
+                'page' => ['nullable', 'integer', 'min:1'],
+                'limit' => ['nullable', 'integer', 'min:1'],
+                'button' => ['nullable', 'string'],
+                'language' => ['nullable', 'string', 'in:zh,vi,en'],
+                'explain' => ['nullable', 'string'],
+                'group_id' => ['nullable', 'integer', 'in:0,1'],
             ]);
-            $search = request()->all();
             $result = KeyboardService::paginate($search);
         } catch (ValidationException $e) {
             return $this->error(HttpStatus::VALIDATION_FAILED, '', $e->errors());

app/Services/KeyboardService.php

@@ -54,6 +54,11 @@ class KeyboardService extends BaseService
         if (isset($search['id']) && !empty($search['id'])) {
             $where[] = ['id', '=', $search['id']];
         }
+
+        if (isset($search['group_id']) && !empty($search['group_id'])) {
+            $where[] = ['group_id', '=', $search['group_id']];
+        }
+
         if (isset($search['button']) && !empty($search['button'])) {
             $where[] = ['button', '=', $search['button']];
         }