告警信息管理列表模糊搜索关键字2

app/Http/Controllers/Admin/ParkingAlarmInformationController.php

@@ -45,26 +45,34 @@ class ParkingAlarmInformationController extends BaseController
                     $type_id = [];
                     $nameTypeId = AdminTranslationService::getLikeTypeIds(100, $keyword);
                     if ($nameTypeId) {
-                        $type_id = $nameTypeId;
+                        $type_id =  $nameTypeId;
                     }
                     $conditionTypeId = AdminTranslationService::getLikeTypeIds(101, $keyword);
                     if ($conditionTypeId) {
-                        $type_id = $conditionTypeId;
+                        $type_id = array_merge($type_id,
+                            (array)$conditionTypeId
+                        );
                     }
                     $contentTypeId = AdminTranslationService::getLikeTypeIds(102, $keyword);
                     if ($contentTypeId) {
-                        $type_id = $contentTypeId;
+                        $type_id = array_merge($type_id,
+                            (array)$contentTypeId
+                        );
                     }
                     $remarkTypeId = AdminTranslationService::getLikeTypeIds(103, $keyword);
                     if ($remarkTypeId) {
-                        $type_id = $remarkTypeId;
+                        $type_id = array_merge($type_id,
+                            (array)$remarkTypeId
+                        );
                     }
                     $query->where(function ($q) use ($keyword, $type_id) {
                         $q->orWhere('name', $keyword);
                         $q->orWhere('condition', $keyword);
                         $q->orWhere('content', $keyword);
                         $q->orWhere('remark', $keyword);
-                        $q->orWhereIn('id', $type_id);
+                        if ($type_id) {
+                            $q->orWhereIn('id', $type_id);
+                        }
                     });
                 }
             }