diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 96529eb..a7a867b 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1395,42 +1395,53 @@ class LelongController extends Controller
 
     public function showAllLelongByCawanganBatchno($kodcaw)
     {
-        $item = array('PMT','batu','permata');
-        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $item = ['PMT', 'batu', 'permata'];
+
+        // Semak kewujudan cawangan dulu
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
+        if (!$cawangan) {
+            return response()->json(['error' => 'Cawangan tidak dijumpai.'], 404);
+        }
+
+        // Ambil data lelong
         $lelong_data = Lelong::on($cawangan['mysql'])
-        ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
-        ->join('lelmarhun', 'lelmarhun.norujukan', '=', 'lelong.norujukan')
-        ->whereNull('upah12')
-        // ->where('lelong.marhun', 'like', '%PMT%')
-        // ->orWhere('lelong.marhun', 'like', '%batu%')
-        // ->orWhere('lelong.marhun', 'like', '%permata%')
-        ->Where(function ($query) use($item) {
-            for ($i = 0; $i < count($item); $i++){
-               $query->orwhere('lelmarhun.nota', 'like',  '%' . $item[$i] .'%');
-            }
-        })
-        ->orderBy('lelong.t_lelong','asc')
-        ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
-        ->whereNull('upah12')
-        ->distinct()
-        ->get();
-        // dd($lelong_data);
+            ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
+            ->join('lelmarhun', 'lelmarhun.norujukan', '=', 'lelong.norujukan')
+            ->whereNull('upah12')
+            ->where(function ($query) use ($item) {
+                foreach ($item as $i) {
+                    $query->orWhere('lelmarhun.nota', 'like', '%' . $i . '%');
+                }
+            })
+            ->orderBy('lelong.t_lelong', 'asc')
+            ->select(
+                'lelong.t_lelong',
+                'gadai.t_gadai',
+                'gadai.nokp',
+                'lelong.pinjaman',
+                'lelong.baki',
+                'lelong.batchno',
+                'lelong.norujukan'
+            )
+            ->distinct()
+            ->get();
+
+        // Group by batch number
         $groupbybatch = $lelong_data->groupBy('batchno');
         $lelong = [];
 
-        foreach($groupbybatch as $index=>$lelongData){
+        foreach ($groupbybatch as $batchno => $lelongData) {
             $total_pembiayaan = $lelongData->sum('pinjaman');
-            // dd($total_pembiayaan);
-            $total_lelong = $lelongData->count('norujukan');
-            array_push($lelong,[
-                // "upah12"=>  $lelongData->upah12,
-                "t_lelong"=>  $lelongData->groupBy('t_lelong'),
-                "batchno"=>  $index,
-                "total_pembiayaan"=> $total_pembiayaan,
-                "total_lelong"=> $total_lelong,
-                "kodcaw"=> $kodcaw,
-            ]);
-            // dd($lelong);
+            $total_lelong = $lelongData->count();
+            $t_lelong = optional($lelongData->first())->t_lelong; // elak error kalau kosong
+
+            $lelong[] = [
+                't_lelong'          => $t_lelong,
+                'batchno'           => $batchno,
+                'total_pembiayaan'  => $total_pembiayaan,
+                'total_lelong'      => $total_lelong,
+                'kodcaw'            => $kodcaw,
+            ];
         }
         return response()->json($lelong);
     }