From 56f4eacb656f232ee2b0f3996e5620682ff6be8f Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 18 Sep 2024 07:48:08 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index d02b5bc5..f4cb1dc7 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -17,7 +17,6 @@ use App\Models\Template; use App\Models\UnitKerja; use App\Models\User; -use Illuminate\Database\Query\Builder; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; @@ -390,16 +389,17 @@ public static function getUsersByPengelola($role, $tanggal, $unit_kerja_id = nul ->where('active', '<=', $tanggal) ->where(function ($query) use ($tanggal) { return $query->where('inactive', '>', $tanggal) - ->orWhere('inactive', '=', null); + ->orWhere('inactive', '=', null); }) ->pluck('user_id') ->toArray(); - if ( $unit_kerja_id == null) { + if ($unit_kerja_id == null) { $usersId = $usersIdByPengelola; } else { $usersIdByUnitKerja = DataPegawai::cache()->get('all')->where('unit_kerja_id', $unit_kerja_id)->where('tanggal', '<=', $tanggal)->pluck('user_id')->toArray(); $usersId = array_intersect($usersIdByPengelola, $usersIdByUnitKerja); } + return User::cache()->get('all')->whereIn('id', $usersId); } @@ -947,6 +947,6 @@ public static function setOptionTahun() public static function setOptionPengelola($role, $tanggal, $unitKerjaId = null) { - return self::setOptions(self::getUsersByPengelola($role, $tanggal, $unitKerjaId),'id','name'); + return self::setOptions(self::getUsersByPengelola($role, $tanggal, $unitKerjaId), 'id', 'name'); } }