From 4781bb146ed1cf92fbe3d6855c28b77343deea42 Mon Sep 17 00:00:00 2001
From: Linksehat Staging Server <it.dev@linksehat.com>
Date: Mon, 19 Feb 2024 09:49:13 +0700
Subject: [PATCH] update bugs fix

---
 .../Http/Controllers/Api/DailyMonitoringController.php    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
index fea450b1..62567586 100644
--- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
+++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
@@ -47,11 +47,13 @@ class DailyMonitoringController extends Controller
             ->where('request_logs.service_code', 'IP')
             ->where('request_logs.deleted_at', null)
             ->when($request->search, function ($q, $search) {
-                $q->where('members.member_id', 'LIKE', "%".$search."%");
-                $q->orWhere('members.name','LIKE',"%".$search."%");
+                $q->where(function ($subQ) use ($search) {
+                    $subQ->where('members.member_id', 'LIKE', "%".$search."%");
+                    $subQ->orWhere('members.name','LIKE',"%".$search."%");
+                });
             })
             // ->where('request_logs.status_final_log', 'approved')
-            ->groupBy('request_logs.member_id')
+            ->groupBy('request_logs.member_id', 'request_logs.organization_id')
             ->orderBy('request_logs.created_at', 'desc')
             // ->get()
             ->paginate();