diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 4b8f0961..fa677543 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -2545,11 +2545,12 @@ class LelongController extends Controller
         $datapindah = lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
         ->select("lelong.id","lelong.tarikh_lelong")
-        ->where('cawangan_lelong.caw_id','!=', $cawangan['id'])
+        ->where('cawangan.caw_code','!=', $cawangan['caw_code'])
         ->where('lelong.sts_lelong', 0)
         ->where('cawangan_lelong.lelong_id','!=', $lelong_id)
         ->where('lelong.id','!=', $lelong_id)
         ->where('lelong.kali','=', $kali)
+        ->groupBy('lelong.id')
         ->get()->toArray();
          foreach($datapindah as $row)
          {
@@ -2579,7 +2580,10 @@ class LelongController extends Controller
         $lelongidasal = $request->lelongidasal;
         $lelongidbaru = $request->lelong_id;
         // dd($lelongidasal);
-
+        $tarikhlelongbaru = LelongBid::where('lelong_id','=',$lelongidbaru)
+        ->where('kodcaw','=',$request->caw)
+        ->first();
+        // dd($tarikhlelongbaru);
         //pindah ID lelong
        if($request->caw)
         {
@@ -2587,8 +2591,7 @@ class LelongController extends Controller
             $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
             // dd($caw);
             foreach($caw as $index=>$cawpindah){
-                // dd($cawpindah->id);
-
+            $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)->first();
             // dd($caw_pindah);
 
             $surat = LelongBid::where('lelong_id','=',$lelongidasal)
@@ -2605,12 +2608,13 @@ class LelongController extends Controller
                     // dd($data);
                         $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first();
                         $caw_pindahsag->lelong_id = $lelongidbaru;
+                        $caw_pindahsag->t_lelong = $tarikhlelongbaru;
                         $caw_pindahsag->update();
 
-                        $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)->first();
-                        $caw_pindah->lelong_id = $lelongidbaru;
-                        $caw_pindah->update();
-
+                        if(empty($caw_pindah)){
+                            $caw_pindah->lelong_id = $lelongidbaru;
+                            $caw_pindah->update();
+                        }
                          //insert loguser
                         $loguser = new LogUser;
                         $loguser->user_id = $user->id;
@@ -2622,6 +2626,13 @@ class LelongController extends Controller
                         $loguser->save();
                 }
             }
+            $checksagcaw = LelongBid::where('lelong_id',$lelongidasal)->where('caw_id', $cawpindah->id)
+                    ->first();
+                    // dd($checksagcaw);
+            if($checksagcaw == null)
+                {
+                    CawanganLelong::where('lelong_id',$lelongidasal)->where('caw_id', $cawpindah->id)->delete();
+                }
             $checksag = LelongBid::where('lelong_id',$lelongidasal)
             ->first();
             // dd($checksag);
@@ -2905,6 +2916,7 @@ class LelongController extends Controller
         $data = $request->checkboxdata;
         $lelongidasal = $request->lelongid;
         $lelongidbaru = $request->lelongidbaru;
+        $caw_id = $request->caw_id;
         // dd($lelongidbaru);
         foreach($data as $index=>$norujukan)
         {