hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/hrms-api-salary into develop

Browse source
This commit is contained in:
moss 2025-04-03 11:14:21 +07:00
commit dc09d86cc8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ReportController.ts
View file

@ -8701,7 +8701,7 @@ export class ReportController extends Controller {
posNoAbb: salary.orgShortName, posNoAbb: salary.orgShortName,
positionName: salary.position, positionName: salary.position,
positionType: salary.posType, 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, remark: v.remark,
orgRoot: salary.root, orgRoot: salary.root,
orgChild1: salary.child1, orgChild1: salary.child1,
@ -8785,7 +8785,7 @@ export class ReportController extends Controller {
posNoAbb: salary.orgShortName, posNoAbb: salary.orgShortName,
positionName: salary.position, positionName: salary.position,
positionType: salary.posType, 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, remark: v.remark,
orgRoot: salary.root, orgRoot: salary.root,
orgChild1: salary.child1, orgChild1: salary.child1,