diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index b1264e94..815b7a0f 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -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: diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 5b845a59..53ac9f1b 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2031,12 +2031,10 @@ export class ProfileEmployeeController extends Controller { positionId: _data.positionIdTemp, posmasterId: _data.posmasterIdTemp, position: _data.position, - 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 || "", employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0),