From fd1800e790958f8b21bfedc8e7ec4085302c9d95 Mon Sep 17 00:00:00 2001 From: leoho2fi Date: Tue, 4 Jun 2024 14:57:12 +0800 Subject: [PATCH] subsidiary null handle --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt index 748735a..48ad93b 100644 --- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt @@ -1606,7 +1606,9 @@ open class ReportService( // NEW Column F: Subsidiary Name val subsidiaryNameCell = row.createCell(5) - subsidiaryNameCell.setCellValue(data["subsidiary_name"] as String) +// subsidiaryNameCell.setCellValue(data["subsidiary_name"] as String) + val subsidiaryName = data["subsidiary_name"] as? String ?: "N/A" // Checks if subsidiary_name is null and replaces it with "N/A" + subsidiaryNameCell.setCellValue(subsidiaryName) // Column G: Project Plan Start Date val projectPlanStartCell = row.createCell(6)