From 731a8e47aa6b1cf3c6be85c4a69bed74fde2256b Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 21 Apr 2025 11:48:40 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=20=E0=B8=82=E0=B8=A3=E0=B8=81.=20>>=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A7=E0=B8=AD=E0=B8=B1=E0=B8=81=E0=B8=A9=E0=B8=A3=E0=B8=A2?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=97=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87=20=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5=E0=B9=82?= =?UTF-8?q?=E0=B8=94=E0=B8=99=E0=B8=A5=E0=B8=87=E0=B9=82=E0=B8=97=E0=B8=A9?= =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=A2=20#1399?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 10 ++++------ src/controllers/ProfileEmployeeController.ts | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) 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),