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())),