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)