From 3c4b099f155a9b3f70e876c26950f721c2023904 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 12 Jul 2024 16:54:22 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?= =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?= =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9A?= =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B8=AB=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=88=E0=B8=B2=E0=B8=81=20=E0=B8=95=E0=B8=B3?= =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B9=83=E0=B8=99?= =?UTF-8?q?=E0=B8=AA=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20#39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 9b922a3..c3d8ace 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -2101,7 +2101,7 @@ export class ReportController extends Controller { }); const root = _root?.root == null ? "" : _root.root; // const agency = salaryProfile[0] == null ? "" : salaryProfile[0].root; - + const formattedData = salaryProfile.map((item, index) => ({ no: Extension.ToThaiNumber(String(index + 1)), fullname: item.prefix + item.firstName + " " + item.lastName, @@ -2114,6 +2114,7 @@ export class ReportController extends Controller { (item.root == undefined && item.root == null ? "" : item.root), posType: item.posType, posLevel: item.posLevel, + posExecutive: item.posExecutive ? item.posExecutive:null, posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),