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

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

Browse source
This commit is contained in:
mamoss 2025-07-18 17:03:31 +07:00
commit e7602c8b08
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileController.ts
View file

@ -5881,7 +5881,7 @@ export class ProfileController extends Controller {
: _data.profileSalary[0].positionExecutive, : _data.profileSalary[0].positionExecutive,
posNo: posNo:
_data.profileSalary[0].posNoAbb && _data.profileSalary[0].posNo _data.profileSalary[0].posNoAbb && _data.profileSalary[0].posNo
? _data.profileSalary[0].posNoAbb + _data.profileSalary[0].posNo ? `${_data.profileSalary[0].posNoAbb} ${_data.profileSalary[0].posNo}`
: _data.profileSalary[0].posNo || "", : _data.profileSalary[0].posNo || "",
rootId: null, rootId: null,
root: _data.profileSalary[0].orgRoot == null ? null : _data.profileSalary[0].orgRoot, root: _data.profileSalary[0].orgRoot == null ? null : _data.profileSalary[0].orgRoot,

2
src/controllers/ProfileEmployeeController.ts
View file

@ -2963,7 +2963,7 @@ export class ProfileEmployeeController extends Controller {
position: _data.position, position: _data.position,
posNo: posNo:
_data.profileSalary[0].posNoAbb && _data.profileSalary[0].posNo _data.profileSalary[0].posNoAbb && _data.profileSalary[0].posNo
? _data.profileSalary[0].posNoAbb + _data.profileSalary[0].posNo ? `${_data.profileSalary[0].posNoAbb} ${_data.profileSalary[0].posNo}`
: _data.profileSalary[0].posNo || "", : _data.profileSalary[0].posNo || "",
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),