From 61a0b889f0f7c0188b6e821c7d53106c71f439ec Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 9 Jul 2024 12:53:00 +0700 Subject: [PATCH] no message --- src/controllers/ReportController.ts | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 19ac180..1b20f57 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1470,17 +1470,13 @@ export class ReportController extends Controller { profile: salaryProfileGroup1 ? salaryProfileGroup1.map((item: any, index: any) => ({ no: Extension.ToThaiNumber(String(index + 1)), - fullname: + affiliation: (item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") + (item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") + (item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") + (item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") + - (item.root == undefined && item.root == null ? "" : item.root) + - "/" + - item.prefix + - item.firstName + - " " + - item.lastName, // สังกัด/ชื่อ-นามสกุล + (item.root == undefined && item.root == null ? "" : item.root), + fullName: item.prefix + item.firstName + " " + item.lastName, posLevel: item.posLevel, posMasterNo: Extension.ToThaiNumber(item.orgShortName) + @@ -1550,17 +1546,13 @@ export class ReportController extends Controller { profileGroup2: salaryProfileGroup2 ? salaryProfileGroup2.map((item, index) => ({ no: Extension.ToThaiNumber(String(index + 1)), - fullname: + affiliation: (item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") + (item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") + (item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") + (item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") + - (item.root == undefined && item.root == null ? "" : item.root) + - "/" + - item.prefix + - item.firstName + - " " + - item.lastName, // สังกัด/ชื่อ-นามสกุล + (item.root == undefined && item.root == null ? "" : item.root), + fullName: item.prefix + item.firstName + " " + item.lastName, posLevel: item.posLevel, posMasterNo: Extension.ToThaiNumber(item.orgShortName) +