diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 2d61056..cb04269 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -200,6 +200,9 @@ export class ReoportController { "evaluation.commanderAbovePositionOld", "evaluation.commanderAboveOrg", "evaluation.commanderAboveOrgOld", + "evaluation.root", + "evaluation.assignedPosition", + "evaluation.assignedPosLevel", "education.educationLevel", "education.institute", @@ -345,7 +348,7 @@ export class ReoportController { oc: evaluation.oc ? evaluation.oc.replace(/\n/g, " ") : "-", org: org ? org : "-", //สังกัด orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค - root: evaluation.salaries.length > 0 ? evaluation.salaries[0].orgRoot : "-", //หน่วยงาน + root: evaluation.root ?evaluation.root : "-", //หน่วยงาน child1: evaluation.salaries.length > 0 // กอง / ศูนย์ / ส่วน ? evaluation.salaries[0].orgChild1 : "-",