From 951592c758d18a70bb371a63a26f8c0318968f68 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 16 Jun 2025 17:52:30 +0700 Subject: [PATCH] fix --- src/controllers/EvaluationController.ts | 6 +++--- src/controllers/ReportController.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/EvaluationController.ts b/src/controllers/EvaluationController.ts index a298ad3..ead33bd 100644 --- a/src/controllers/EvaluationController.ts +++ b/src/controllers/EvaluationController.ts @@ -551,11 +551,11 @@ export class EvaluationController { }); const before = null; let typeTh = - evaluation.type == "EXPERT" + requestBody.type == "EXPERT" ? "ชำนาญการ" - : evaluation.type == "EXPERTISE" + : requestBody.type == "EXPERTISE" ? "เชียวชาญ" - : evaluation.type == "SPECIAL_EXPERT" + : requestBody.type == "SPECIAL_EXPERT" ? "ชำนาญการพิเศษ" : ""; await new CallAPI() diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index ce4e2b7..c260dc4 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -341,7 +341,7 @@ export class ReoportController { // ตำแหน่งเดิม, posAndPosLevel: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.positionLevel ? `${evaluation.positionLevel}` : ""), // ตำแหน่งใหม่ - posAndTypeTh: (evaluation.assignedPosition ? `${evaluation.assignedPosition}` : "" ) + (evaluation.assignedPosLevel ? `${evaluation.assignedPosLevel}` : ""), + posAndTypeTh: (evaluation.assignedPosition ? `${evaluation.assignedPosition}` : "" ) + (evaluation.assignedPosLevel ? `${evaluation.assignedPosLevel}` : `${typeTh??""}`), posLevel: evaluation.assignedPosLevel ?? "-", //ระดับที่ขอประเมิน posNo: evaluation.posNo ? Extension.ToThaiNumber(evaluation.posNo) : "", posNoWithSym: evaluation.posNo ? `(${Extension.ToThaiNumber(evaluation.posNo)})` : "",