Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts: # app/Helpers/Lpj.php
2025-03-10 10:41:19 +07:00
parent de6e7ad732 3dcf833035
commit bd801d3235
1 changed files with 6 additions and 1 deletions
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -380,7 +380,12 @@ function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan')
        'permohonan_id' => $permohonanId,
        'dokumen_jaminan_id' => $documentId,
    ])->first();
-    return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at ?? "-";
+
+    if (!$laporan) {
+        return $type == 'nomor_laporan' ? '-' : null;
+    }
+
+    return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at;
 }

 function getCustomField($param)