diff --git a/app/Helpers/OutstandingHelper.php b/app/Helpers/OutstandingHelper.php
index 98195e2..f400fd9 100644
--- a/app/Helpers/OutstandingHelper.php
+++ b/app/Helpers/OutstandingHelper.php
@@ -49,7 +49,11 @@ class OutstandingHelper
                     if ($status !== 'Approved 1') {
                         return false;
                     }
-                    if ($cabangId && optional($form->rayon)->cabang_id !== $cabangId) {
+                 
+                    $formCabangId = optional($form->rayon)->cabang_id
+                        ?? optional(optional($form->user)->cabang)->cabang_id
+                        ?? optional(optional(optional($form->user)->cabang)->cabang)->id;
+                    if ($cabangId !== null && (string) $formCabangId !== (string) $cabangId) {
                         return false;
                     }
                     return true;