diff --git a/app/Http/Controllers/LaporanFileController.php b/app/Http/Controllers/LaporanFileController.php index 3d0a161..eafff0e 100644 --- a/app/Http/Controllers/LaporanFileController.php +++ b/app/Http/Controllers/LaporanFileController.php @@ -8,6 +8,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; use App\Models\LaporanFile; +use App\Models\MappingDbhSkpd; use App\Models\User; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; @@ -143,9 +144,13 @@ class LaporanFileController extends Controller $data = LaporanFile::where("tahun",$ta); if (getRole()=="skpd"){ - $data->where("kode_skpd",Auth::user()->nrk); + $data->whereIn("kode_skpd",[Auth::user()->nrk,'anggaran']); + $data->where(function($subquery){ + $subquery->whereIn("kode_rekening",MappingDbhSkpd::whereIn("kode_skpd",[Auth::user()->nrk])->pluck("kode_rekening")); + }); } - + // var_dump(MappingDbhSkpd::whereIn("kode_skpd",[Auth::user()->nrk])->pluck("kode_rekening")); exit; + if($kode_rekening){ $data->where("kode_rekening", $kode_rekening); } diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index d33d1e4..aed9398 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -131,7 +131,7 @@ class RealisasiPendapatanController extends Controller $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):""; $dataFilter=0; - $data = PendapatanRealisasi::where("tahun",$ta)->orderBy("created_at","ASC"); + $data = PendapatanRealisasi::where("tahun",$ta)->orderBy("SIMTRAD4_TGL_SP2D_BUN","DESC"); if (!empty($sps)) { $data->where("kode_rekening_sps",$sps);