From ca8473181c143f9ed2bfdbc5e2c355da8a2b675a Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Tue, 21 Oct 2025 09:44:34 +0700 Subject: [PATCH] update --- app/Http/Controllers/Auth/CustomLoginController.php | 5 +++-- app/Http/Controllers/Management/UserController.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/CustomLoginController.php b/app/Http/Controllers/Auth/CustomLoginController.php index 5d8094b..60ea27b 100644 --- a/app/Http/Controllers/Auth/CustomLoginController.php +++ b/app/Http/Controllers/Auth/CustomLoginController.php @@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Http\Request; use App\Models\User; +use App\Models\UserInstansi; class CustomLoginController extends Controller { @@ -42,7 +43,7 @@ class CustomLoginController extends Controller 'email' => $user->email, 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, - 'instansi_id' => @$user->ms_instansi_id, + 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ]; @@ -71,7 +72,7 @@ class CustomLoginController extends Controller 'email' => $user->email, 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, - 'instansi_id' => @$user->ms_instansi_id, + 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ]; diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php index 0dc71a0..3735175 100644 --- a/app/Http/Controllers/Management/UserController.php +++ b/app/Http/Controllers/Management/UserController.php @@ -258,7 +258,7 @@ class UserController extends Controller 'email' => $user->email, 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, - 'instansi_id' => @$user->ms_instansi_id, + 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ];