Fix query sql kelompok dan proposal

app/Http/Controllers/Dosen/KelompokController.php

@@ -33,10 +33,14 @@ class KelompokController extends Controller
 
         $kelompok = Kelompok::with(['rAnggota'])
                     // ->where('nidn_dosen', $bio->noidentitas)
-                    ->when($bio->noidentitas !== null, function ($query) use ($bio) {
-                        return $query->where('nidn_dosen', $bio->noidentitas);
+                    // ->when($bio->noidentitas !== null, function ($query) use ($bio) {
+                    //     return $query->where('nidn_dosen', $bio->noidentitas)
+                    //     ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+                    // })
+                    ->where(function ($query) use ($bio) {
+                        $query->where('nidn_dosen', $bio->noidentitas)
+                              ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
                     })
-                    ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)])
                     ->where('kirim', '1')
                     ->whereYear('created_at', $year)
                     ->orderBy('kode')

app/Http/Controllers/Dosen/ProposalController.php

@@ -33,10 +33,21 @@ class ProposalController extends Controller
         $periode  = Periode::query()->get();
         $year     = !is_null($request->year) ? $request->year : now()->year;
 
+        // $proposal = Proposal::with(['rKelompok', 'rJenis', 'rDaftarPro'])
+        //             ->whereHas('rKelompok', function ($query) use($bio){
+        //                 $query->where('nidn_dosen', $bio->noidentitas)
+        //                 ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+        //             })
+        //             ->whereYear('created_at', $year)
+        //             ->orderBy('kelompok_id')
+        //             ->get();
+
         $proposal = Proposal::with(['rKelompok', 'rJenis', 'rDaftarPro'])
-                    ->whereHas('rKelompok', function ($query) use($bio){
-                        $query->where('nidn_dosen', $bio->noidentitas)
-                        ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+                    ->whereHas('rKelompok', function ($query) use($bio) {
+                        $query->where(function ($q) use ($bio) {
+                            $q->where('nidn_dosen', $bio->noidentitas)
+                            ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+                        });
                     })
                     ->whereYear('created_at', $year)
                     ->orderBy('kelompok_id')