diff --git a/app/Http/Controllers/Admin/ParkingChannelController.php b/app/Http/Controllers/Admin/ParkingChannelController.php index 6f44045..342ef0c 100644 --- a/app/Http/Controllers/Admin/ParkingChannelController.php +++ b/app/Http/Controllers/Admin/ParkingChannelController.php @@ -63,7 +63,9 @@ class ParkingChannelController extends BaseController } $query->where(function ($query) use ($name, $typeId) { $query->orWhere('name', 'like', "%{$name}%"); - $query->orWhereIn('id', $typeId); + if ($typeId) { + $query->orWhereIn('id', $typeId); + } }); } } diff --git a/app/Http/Controllers/Admin/ParkingDepartureReasonController.php b/app/Http/Controllers/Admin/ParkingDepartureReasonController.php index a8be138..6c38ea4 100644 --- a/app/Http/Controllers/Admin/ParkingDepartureReasonController.php +++ b/app/Http/Controllers/Admin/ParkingDepartureReasonController.php @@ -46,7 +46,17 @@ class ParkingDepartureReasonController extends BaseController if ($request->has('reason')) { $reason = $request->input('reason'); if ($reason) { - $query->where('reason', 'like', "%{$reason}%"); + $typeIds = []; + $reasonTypeIds = AdminTranslationService::getLikeTypeIds(8, $reason); + if ($reasonTypeIds) { + $typeIds = $reasonTypeIds; + } + $query->where(function ($query) use ($reason, $typeIds) { + $query->orWhere('reason', 'like', "%{$reason}%"); + if ($typeIds) { + $query->orWhereIn('id', $typeIds); + } + }); } }