From 22eae4baea72b8f6273969a351f67a4abadfa889 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Wed, 24 Jun 2026 10:58:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=81=93=E7=AE=A1=E7=90=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8F=AF=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ParkingChannelController.php | 12 ++++++------ app/Services/AdminTranslationService.php | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/ParkingChannelController.php b/app/Http/Controllers/Admin/ParkingChannelController.php index 33b266e..6f44045 100644 --- a/app/Http/Controllers/Admin/ParkingChannelController.php +++ b/app/Http/Controllers/Admin/ParkingChannelController.php @@ -56,14 +56,14 @@ class ParkingChannelController extends BaseController if ($request->has('name')) { $name = $request->input('name'); if ($name) { - $typeId = 0; - $nameTypeId = AdminTranslationService::getTypeId(6, $name); - if ($nameTypeId) { - $typeId = $nameTypeId; + $typeId = []; + $nameTypeIds = AdminTranslationService::getLikeTypeIds(6, $name); + if ($nameTypeIds) { + $typeId = $nameTypeIds; } $query->where(function ($query) use ($name, $typeId) { - $query->orWhere('name', $name); - $query->orWhere('id', $typeId); + $query->orWhere('name', 'like', "%{$name}%"); + $query->orWhereIn('id', $typeId); }); } } diff --git a/app/Services/AdminTranslationService.php b/app/Services/AdminTranslationService.php index 9b8c705..5471f5d 100644 --- a/app/Services/AdminTranslationService.php +++ b/app/Services/AdminTranslationService.php @@ -242,6 +242,16 @@ class AdminTranslationService $query->orWhere('zh_tw', $name); } )->value('type_id'); + } + public static function getLikeTypeIds($type, $name) + { + return AdminTranslation::query()->where('type', $type)->where( + function ($query) use ($name) { + $query->orWhere('en', 'like', "%{$name}%"); + $query->orWhere('zh_cn', 'like', "%{$name}%"); + $query->orWhere('zh_tw', 'like', "%{$name}%"); + } + )->pluck('type_id'); } }