From 6710c77f8919cd7e261137c3a0d05f3d7a61c9db Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Thu, 11 Jun 2026 14:54:55 +0700 Subject: [PATCH] update --- app/Http/Controllers/Activity/FormController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php index 571e55d..8236dfb 100644 --- a/app/Http/Controllers/Activity/FormController.php +++ b/app/Http/Controllers/Activity/FormController.php @@ -58,7 +58,7 @@ class FormController implements HasMiddleware // Fetch form details $formDetails = SettingFormDetail::rowActive()->where('form_code', $code)->orderByRowNum()->get(); - dd($instansi); + if ($instansi && $instansi != 'all' && $instansi != 'none') { $agency = Agency::where('name', $instansi)->rowActive()->first(); $instansi = $agency ? $agency->id : null; @@ -69,7 +69,7 @@ class FormController implements HasMiddleware $scope = $user->getScope(); if ($scope === LingkupAksesData::INTERNAL->value) { - $instansi = $user->agency_id; + $instansi = $user->ms_agency_id; } $agencies = Agency::whereHas('agencyActivity', function ($query) use ($sector, $code, $scope, $user) { @@ -77,7 +77,7 @@ class FormController implements HasMiddleware ->where('form_code', $code); if ($scope === LingkupAksesData::INTERNAL->value) { - $query->where('agency_id', $user->agency_id); + $query->where('agency_id', $user->ms_agency_id); } })->get();