diff --git a/app/Http/Controllers/Admin/FloorController.php b/app/Http/Controllers/Admin/FloorController.php
index 3d9de13..9fddac1 100644
--- a/app/Http/Controllers/Admin/FloorController.php
+++ b/app/Http/Controllers/Admin/FloorController.php
@@ -57,7 +57,24 @@ class FloorController extends BaseController
             if ($request->has('name')) {
                 $name = $request->input('name');
                 if ($name) {
-                    $query->where('name', 'like', "%{$name}%");
+                    $typeId = [];
+                    $nameTypeIds = AdminTranslationService::getLikeTypeIds(4, $name);
+                    if ($nameTypeIds) {
+                        $typeId = $nameTypeIds;
+                    }
+                    $query->where(function ($query) use ($name, $typeId) {
+                        $query->orWhere('name', 'like', "%{$name}%");
+                        if ($typeId) {
+                            $query->orWhereIn('id', $typeId);
+                        }
+                    });
+                }
+            }
+
+            if ($request->has('floor_id')) {
+                $floor_id = $request->input('floor_id');
+                if ($floor_id) {
+                    $query->where('id', $floor_id);
                 }
             }
 
@@ -274,7 +291,8 @@ class FloorController extends BaseController
             $data = [
                 'building_floor_list' => get_select_data(
                     AdminFloorService::getBuildingFloor()
-                )
+                ),
+                'floor_list' => AdminFloor::getData()
             ];
             return $this->responseService->success($data);
         } catch (Exception $e) {