From b5bfc6bacdd7390640ea15f16f24a522455dbbcb Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 3 Apr 2025 10:34:42 +0700 Subject: [PATCH 1/2] #1356 command36,37 --- src/controllers/ReportController.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 1d23d1a..124305f 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -8681,7 +8681,7 @@ export class ReportController extends Controller { id: v.refId, }, }); - + if (salary != null) { await new CallAPI() .PostData(request, "/org/profile-employee/salary/update", { @@ -8696,7 +8696,7 @@ export class ReportController extends Controller { posNoAbb: salary.orgShortName, positionName: salary.position, positionType: salary.posType, - positionLevel: salary.posLevel != null ? salary.posLevel.toString() : null, + positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + "." : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), remark: v.remark, orgRoot: salary.root, orgChild1: salary.child1, @@ -8780,7 +8780,7 @@ export class ReportController extends Controller { posNoAbb: salary.orgShortName, positionName: salary.position, positionType: salary.posType, - positionLevel: salary.posLevel != null ? salary.posLevel.toString() : null, + positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + "." : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), remark: v.remark, orgRoot: salary.root, orgChild1: salary.child1, From 00821559a2efe649ac87dcb5803cc661d2d1b42c Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 3 Apr 2025 11:00:42 +0700 Subject: [PATCH 2/2] fix --- src/controllers/ReportController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 124305f..cd209d0 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -8696,7 +8696,7 @@ export class ReportController extends Controller { posNoAbb: salary.orgShortName, positionName: salary.position, positionType: salary.posType, - positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + "." : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), + positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + " " : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), remark: v.remark, orgRoot: salary.root, orgChild1: salary.child1, @@ -8780,7 +8780,7 @@ export class ReportController extends Controller { posNoAbb: salary.orgShortName, positionName: salary.position, positionType: salary.posType, - positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + "." : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), + positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + " " : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''), remark: v.remark, orgRoot: salary.root, orgChild1: salary.child1,