diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 240ec4d..8847e4c 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -8686,7 +8686,7 @@ export class ReportController extends Controller { id: v.refId, }, }); - + if (salary != null) { await new CallAPI() .PostData(request, "/org/profile-employee/salary/update", { @@ -8701,7 +8701,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, @@ -8785,7 +8785,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,