From 31faf3b62b36a7d35fa45a1d8c62e2bea703456f Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Wed, 20 Mar 2024 20:34:23 +0700
Subject: [PATCH] fix gov1-04

---
 src/controllers/ReportController.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index b00d03a..ec0cc4b 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1085,6 +1085,7 @@ export class ReportController extends Controller {
            fullname: item.prefix + item.firstName + " " + item.lastName,
            log_group: item.salaryOrg.group,
            log_type: item.type,
+           log_isNext: item.isNext,
            position:
              item.position +
              "/" +
@@ -1103,10 +1104,10 @@ export class ReportController extends Controller {
           (item.positionSalaryAmount == undefined || item.positionSalaryAmount == null ? "๐" : Extension.ToThaiNumber(String(item.positionSalaryAmount))) +
           (item.amountSpecial == undefined || item.amountSpecial == null ? "๐" : `(${Extension.ToThaiNumber(String(item.amountSpecial))})`),
            score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
-           remark:
-             `${item.type == "FULL" ? "" : "หนึ่งขั้น"}\n` +
-             `${item.amountSpecial != 0 ? "" : "ได้รับค่าตอบแทนพิเศษ"}\n` +
-             `${item.isNext == true ? "" : "(ได้รับเงินเดือนสูงกว่าขั้นสูงฯ)"}`, // หมายเหตุ
+          remark: 
+          `${item.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
+          `${(item.type === "FULL" && item.amountSpecial == 0 && item.amountSpecial == null && item.amountSpecial == undefined) ? "ได้รับค่าตอบแทนพิเศษ\n" : ""}` +
+          `${(item.type === "FULL" && item.isNext === true) ? "(ได้รับเงินเดือนสูงกว่าขั้นสูงฯ)" : ""}`, // หมายเหตุ
          })),
        },
      });