From c6f1db8670554b9ccee00b22bcb7d15d78d3b72a Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 16 Jun 2025 10:42:38 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20=E0=B8=87=E0=B8=B2=E0=B8=99/=E0=B8=9D=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2/=E0=B8=81=E0=B8=A5=E0=B8=B8=E0=B9=88=E0=B8=A1,=20?= =?UTF-8?q?=E0=B8=81=E0=B8=AD=E0=B8=87/=E0=B8=A8=E0=B8=B9=E0=B8=99?= =?UTF-8?q?=E0=B8=A2=E0=B9=8C/=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index c1097dc..8988b7e 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -344,7 +344,13 @@ export class ReoportController { oc: evaluation.oc ? evaluation.oc.replace(/\n/g, " ") : "-", org: org ? org : "-", //สังกัด orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค - root: root ? root : "-", //หน่วยงาน + root: evaluation.salaries.length > 0 ? evaluation.salaries[0].orgRoot : "-", //หน่วยงาน + child1: evaluation.salaries.length > 0 // กอง / ศูนย์ / ส่วน + ? evaluation.salaries[0].orgChild1 + : "-", + child432: evaluation.salaries.length > 0 // งาน / ฝ่าย / กลุ่ม + ? `${evaluation.salaries[0].orgChild4 ?? ""} ${evaluation.salaries[0].orgChild3 ?? ""} ${evaluation.salaries[0].orgChild2 ?? ""}`.trim() + : "-", salary: evaluation.salary ? Extension.ToThaiNumber(Number(evaluation.salary).toLocaleString()) : "-", salaryWithPrefix: evaluation.salary ? "อัตราเงินเดือนปัจจุบัน" +" "+ Extension.ToThaiNumber(Number(evaluation.salary).toLocaleString()) : "-", positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "",