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

This commit is contained in:
moss 2025-04-03 11:14:21 +07:00
commit dc09d86cc8

View file

@ -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,