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

fix ระบบทะเบียนประวัติผู้พ้นจากราชการ ขรก. >>ตัวอักษรย่อเลขที่ทำแหน่งไม่แสดง กรณีโดนลงโทษทางวินัย #1399

Browse source
This commit is contained in:
Bright 2025-04-21 11:48:40 +07:00
parent 495d818eb3
commit 731a8e47aa
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileController.ts
View file

@ -5860,11 +5860,9 @@ export class ProfileController extends Controller {
? null ? null
: _data.profileSalary[0].positionExecutive, : _data.profileSalary[0].positionExecutive,
posNo: posNo:
_data.profileSalary[0].posNoAbb == "" _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,
orgRootShortName: orgRootShortName:

8
src/controllers/ProfileEmployeeController.ts
View file

@ -2032,11 +2032,9 @@ export class ProfileEmployeeController extends Controller {
posmasterId: _data.posmasterIdTemp, posmasterId: _data.posmasterIdTemp,
position: _data.position, position: _data.position,
posNo: posNo:
_data.profileSalary[0].posNoAbb == "" _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),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0),