From 4bbe59db9285a70b38d174c6ba9f72b8d56d65ed Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Wed, 24 Jun 2026 11:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E5=8E=9F=E5=9B=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8F=AF=E8=8B=B1=E6=96=87=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ParkingChannelController.php | 4 +++- .../Admin/ParkingDepartureReasonController.php | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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); + } + }); } }