fix globalsearch

dbarzin · Nov 21, 2023 · 03b54b0 · 03b54b0
1 parent 4e0a0fe
commit 03b54b0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/Http/Controllers/GlobalSearchController.php b/app/Http/Controllers/GlobalSearchController.php
@@ -47,9 +47,14 @@ public function search(Request $request)
                     ->where('control_user.user_id', '=', Auth::User()->id);
             }
 
-            foreach ($fields as $field) {
-                $query->orWhere($field, 'LIKE', '%' . $term . '%');
-            }
+            $query = $query->where(function ($subQuery) use ($fields, $term) {
+                foreach ($fields as $field) {
+                    if ( $field === reset( $fields ) )
+                        $subQuery = $subQuery->where($field, 'LIKE', '%' . $term . '%');
+                    else
+                        $subQuery = $subQuery->orWhere($field, 'LIKE', '%' . $term . '%');
+                    }
+            });
 
             // newest first
             $query->orderBy('id', 'desc');