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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-21 15:00:25 +07:00
commit aaf2ad880d
8 changed files with 162 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/ProfileController.ts
View file

@ -1615,7 +1615,7 @@ export class ProfileController extends Controller {
).toLocaleString(),
)
: "";
const fullCurrentAddress = profiles
const fullCurrentAddress = profiles && profiles.currentAddress
? Extension.ToThaiNumber(
profiles.currentAddress +
" ตำบล/แขวง " +
@ -1627,7 +1627,7 @@ export class ProfileController extends Controller {
profiles.currentZipCode,
)
: "";
const fullRegistrationAddress = profiles
const fullRegistrationAddress = profiles && profiles.registrationAddress
? Extension.ToThaiNumber(
profiles.registrationAddress +
" ตำบล/แขวง " +
@ -5859,12 +5859,10 @@ export class ProfileController extends Controller {
_data.profileSalary[0].positionExecutive == null
? null
: _data.profileSalary[0].positionExecutive,
posNo:
_data.profileSalary[0].posNoAbb == ""
? ""
: _data.profileSalary[0].posNoAbb + _data.profileSalary[0].posNo == ""
? ""
: _data.profileSalary[0].posNo,
posNo:
_data.profileSalary[0].posNoAbb && _data.profileSalary[0].posNo
? _data.profileSalary[0].posNoAbb + _data.profileSalary[0].posNo
: _data.profileSalary[0].posNo || "",
rootId: null,
root: _data.profileSalary[0].orgRoot == null ? null : _data.profileSalary[0].orgRoot,
orgRootShortName: