From 345d2fbbee358d8e1c0bd632e30407e85bdaff28 Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Thu, 26 Dec 2024 20:58:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=AD=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/CommandController.ts | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 7537cc0c..5bee8980 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -1717,40 +1717,41 @@ export class CommandController extends Controller {
             commandRecive.order = order;
             let salaryData = null_;
 
-            const excludedCommands = ["C-PM-33", "C-PM-34", "C-PM-35", "C-PM-36", "C-PM-37"];
-            if (!excludedCommands.includes(commandCode)) {
-              if (item.profileId) {
-                salaryData = await this.profileRepository.findOne({
+            // const excludedCommands = ["C-PM-33", "C-PM-34", "C-PM-35", "C-PM-36", "C-PM-37"];
+            // if (!excludedCommands.includes(commandCode)) {
+            if (item.profileId) {
+              salaryData = await this.profileRepository.findOne({
+                where: {
+                  id: item.profileId,
+                },
+              });
+              let null_: any = 0;
+              if (!salaryData) {
+                salaryData = await this.profileEmployeeRepository.findOne({
                   where: {
                     id: item.profileId,
                   },
                 });
-                let null_: any = 0;
-                if (!salaryData) {
-                  salaryData = await this.profileEmployeeRepository.findOne({
-                    where: {
-                      id: item.profileId,
-                    },
-                  });
-                }
-                commandRecive.amount = salaryData ? salaryData.amount : null_;
-                commandRecive.amountSpecial = salaryData ? salaryData.amountSpecial : null_;
-                commandRecive.positionSalaryAmount = salaryData
-                  ? salaryData.positionSalaryAmount
-                  : null_;
-                commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_;
-              } else {
-                commandRecive.amount = null_;
-                commandRecive.amountSpecial = null_;
-                commandRecive.positionSalaryAmount = null_;
-                commandRecive.mouthSalaryAmount = null_;
               }
+              commandRecive.amount = item.amount ?? (salaryData ? salaryData.amount : null_);
+              commandRecive.amountSpecial =
+                item.amountSpecial ?? (salaryData ? salaryData.amountSpecial : null_);
+              commandRecive.positionSalaryAmount =
+                item.positionSalaryAmount ?? (salaryData ? salaryData.positionSalaryAmount : null_);
+              commandRecive.mouthSalaryAmount =
+                item.mouthSalaryAmount ?? (salaryData ? salaryData.mouthSalaryAmount : null_);
             } else {
-              commandRecive.amount = item.amount ?? null_;
-              commandRecive.amountSpecial = item.amountSpecial ?? null_;
-              commandRecive.positionSalaryAmount = item.positionSalaryAmount ?? null_;
-              commandRecive.mouthSalaryAmount = item.mouthSalaryAmount ?? null_;
+              commandRecive.amount = null_;
+              commandRecive.amountSpecial = null_;
+              commandRecive.positionSalaryAmount = null_;
+              commandRecive.mouthSalaryAmount = null_;
             }
+            // } else {
+            //   commandRecive.amount = item.amount ?? null_;
+            //   commandRecive.amountSpecial = item.amountSpecial ?? null_;
+            //   commandRecive.positionSalaryAmount = item.positionSalaryAmount ?? null_;
+            //   commandRecive.mouthSalaryAmount = item.mouthSalaryAmount ?? null_;
+            // }
 
             commandRecive.remarkVertical =
               item.remarkVertical == null ? null_ : item.remarkVertical;