From 785c5ccbaff98992ec33140d9a32a33c30359e19 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 11 Feb 2025 10:33:01 +0700 Subject: [PATCH] fix --- src/controllers/ReportController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 7f773a8..f64e7cf 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -58,7 +58,7 @@ export class ReoportController { * */ @Get() - async sumaryEvaluationReport(@Query("year") year?: string, @Query("rootid") rootId?: string) { + async sumaryEvaluationReport(@Query("year") year?: string, @Query("rootid") rootId?: string, @Query("nameOrg") nameOrg?: string) { const yearInAD = year?year:null; const yearInBE = yearInAD ? (parseInt(yearInAD) - 543).toString() : null; @@ -115,7 +115,7 @@ export class ReoportController { data: { year: year?Extension.ToThaiNumber(year.toString()):Extension.ToThaiNumber(new Date().getFullYear().toString()), date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), - mainAgency: rootId && result.length > 0?result[0].agency:"", + mainAgency: rootId && result.length > 0?result[0].agency: rootId && result.length === 0 ? '':'หน่วยงานทั้งหมด', list: result, total: Extension.ToThaiNumber(submitter.toString()), sumPass: Extension.ToThaiNumber(sumPass.toString()),