diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index ee37d32..fbefdaf 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -3514,21 +3514,50 @@ class AdminPageController extends Controller
         }else{
                 $sortBy = null;
         }
-                
-        $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
-        ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
-        ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
-        ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
-        ->whereNotNull('gad.upah12')
-        ->whereNotNull('lelong.hargajual')
-        ->whereNull('lelong.trkhtuntut')
-        ->when($sortBy, function ($query) use ($sortBy) {
-                return $query->where('baki',$sortBy,'0');
-        }, function ($query) {
-                return $query->where('baki','!=','0');
-        })
-        ->get()->toArray();
-
+         
+        if($request->jenistuntut == 'belumtuntut'){
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->whereNull('lelong.trkhtuntut')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }else if($request->jenistuntut == 'sudahtuntut'){
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->whereNotNull('lelong.trkhtuntut')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }else{
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }
+        
         return response()->json($batchleltuntutbaki);
     }
 }