From 0a89d0abb9d2f0ad355d90c9d159c64e50429fb8 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 18 Jul 2025 16:39:45 +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>>=20=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?= =?UTF-8?q?=E0=B8=87=20#1653?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 53f46bff..7efbfdd4 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -5879,7 +5879,7 @@ export class ProfileController extends Controller { : _data.profileSalary[0].positionExecutive, 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 || "", rootId: null, root: _data.profileSalary[0].orgRoot == null ? null : _data.profileSalary[0].orgRoot, diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index d6c198d9..79317d93 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2963,7 +2963,7 @@ export class ProfileEmployeeController extends Controller { position: _data.position, 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 || "", employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),