From 6486eff055f45a09530c3680f471373b805a96e5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 14 Jul 2025 12:07:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84=E0=B8=82=E0=B8=84?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B9=80=E0=B8=A3=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=A3=E0=B8=A3=E0=B8=96=E0=B8=99=E0=B8=B0=20?=
 =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=AA=E0=B8=A1=E0=B8=A3=E0=B8=A3=E0=B8=96?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B0=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A5=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KpiUserEvaluationController.ts            | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index d0153e7..ec62936 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -761,28 +761,19 @@ export class KpiUserEvaluationController extends Controller {
     });
 
     let levelForGourp: any = null;
-    if (
-      kpiUserEvaluation.posTypeName == "วิชาการ" &&
-      kpiUserEvaluation.posLevelName == "ทรงคุณวุฒิ"
-    )
+    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "ทรงคุณวุฒิ" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "5";
-    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "เชี่ยวชาญ")
+    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "เชี่ยวชาญ" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "4";
-    if (
-      kpiUserEvaluation.posTypeName == "วิชาการ" &&
-      kpiUserEvaluation.posLevelName == "ชำนาญการพิเศษ"
-    )
+    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "ชำนาญการพิเศษ" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "4";
-    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "ชำนาญการ")
+    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "ชำนาญการ" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "3";
-    if (
-      kpiUserEvaluation.posTypeName == "วิชาการ" &&
-      kpiUserEvaluation.posLevelName == "ปฏิบัติการ"
-    )
+    if (kpiUserEvaluation.posTypeName == "วิชาการ" && kpiUserEvaluation.posLevelName == "ปฏิบัติการ" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "2";
     if (kpiUserEvaluation.posTypeName == "ทั่วไป" && kpiUserEvaluation.posLevelName == "ทักษะพิเศษ")
       levelForGourp = "4";
-    if (kpiUserEvaluation.posTypeName == "ทั่วไป" && kpiUserEvaluation.posLevelName == "อาวุโส")
+    if (kpiUserEvaluation.posTypeName == "ทั่วไป" && kpiUserEvaluation.posLevelName == "อาวุโส" && kpiUserEvaluation.posExecutiveName == null)
       levelForGourp = "3";
     if (kpiUserEvaluation.posTypeName == "ทั่วไป" && kpiUserEvaluation.posLevelName == "ชำนาญงาน")
       levelForGourp = "2";