diff --git a/app/Http/Controllers/Admin/IndexController.php b/app/Http/Controllers/Admin/IndexController.php index 339aabe..e59817d 100644 --- a/app/Http/Controllers/Admin/IndexController.php +++ b/app/Http/Controllers/Admin/IndexController.php @@ -28,12 +28,13 @@ class IndexController extends BaseController { try { $data = []; - $building_floor = $request->get('building_floor', 1); + $building_floor = $request->get('building_floor', ''); + $floorModel = AdminFloor::query(); + if ($building_floor) { + $floorModel->where('building_floor', $building_floor); + } $pattern_id = $request->get('pattern_id', 1); - $floorData = AdminFloor::query()->where( - 'building_floor', - $building_floor - )->select(['id', 'name'])->get()->toArray(); + $floorData = $floorModel->select(['id', 'name'])->get()->toArray(); foreach ($floorData as $item) { $floor_id = $item['id']; $floor_name = $item['name'];