diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php index 8f8dfed..9e8722c 100644 --- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php +++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php @@ -34,11 +34,11 @@ class AdministrasiController extends Controller $kuesioner = Kuesioner::where('tahun',date('Y'))->where('ms_sekolah_id',session('sekolah_id'))->orderBy('created_at','DESC'); }else{ if(session('kabupaten_id') != ''){ - $kuesioner = Kuesioner::where('tahun',date('Y'))->whereHas('sekolah',function($query){ + $kuesioner = Kuesioner::whereHas('sekolah',function($query){ $query->where('ms_kabupaten_id',session('kabupaten_id')); })->orderBy('created_at','DESC'); }else{ - $kuesioner = Kuesioner::where('tahun',date('Y'))->orderBy('created_at','DESC'); + $kuesioner = Kuesioner::orderBy('created_at','DESC'); } }