From 3577b97ca0c9f6b21952dc195c4dd6f9107faad4 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 6 Mar 2024 18:20:12 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B8=87=E0=B8=81=E0=B8=B1?= =?UTF-8?q?=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/Report_1_Controller.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/controllers/Report_1_Controller.ts b/src/controllers/Report_1_Controller.ts index d4ff762..b6ea1b2 100644 --- a/src/controllers/Report_1_Controller.ts +++ b/src/controllers/Report_1_Controller.ts @@ -94,7 +94,12 @@ export class Report_1_Controller extends Controller { profile: salaryProfile.map((item, index) => ({ no: index+1, fullname: item.prefix + item.firstName +" "+ item.lastName, - position: item.position + "/" + item.posType, + position: item.position + "/" + + (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), posLevel: item.posLevel, orgShortName: item.orgShortName+item.posMasterNo, amount: item.amount == null ? 0 : item.amount,