From 22ccf8f82de810db27148b64ed530c5373e88c78 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 21 Oct 2024 17:16:36 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=80=E0=B8=87?= =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=95=E0=B8=A3=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index a677171c..9c10eb5e 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2097,6 +2097,9 @@ export class CommandController extends Controller { refCommandNo?: string | null; salaryRef?: string | null; commandId?: string | null; + amount?: Double | null; + positionSalaryAmount?: Double | null; + mouthSalaryAmount?: Double | null; }[]; }, ) { @@ -2134,11 +2137,9 @@ export class CommandController extends Controller { profile.profileSalary.length > 0 ? profile.profileSalary[0].positionPathSide : null, positionExecutive: profile.profileSalary.length > 0 ? profile.profileSalary[0].positionExecutive : null, - amount: profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null, - positionSalaryAmount: - profile.profileSalary.length > 0 ? profile.profileSalary[0].positionSalaryAmount : null, - mouthSalaryAmount: - profile.profileSalary.length > 0 ? profile.profileSalary[0].mouthSalaryAmount : null, + amount: item.amount ? item.amount : null, + positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, + mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, order: profile.profileSalary.length >= 0 ? profile.profileSalary.length > 0