From 741eccd933ace4efd18457dc32fbd9277ac351c7 Mon Sep 17 00:00:00 2001
From: moss <>
Date: Wed, 14 May 2025 11:36:38 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveRequestController.cs      | 8 ++++----
 BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 3591e8f5..d743fce5 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -411,7 +411,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             // add dear and oc_data
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
-            var approver = profile.Commander ?? "";
+            // var approver = profile.Commander ?? "";
             var userOc = profile.Root ?? "";
             //if (rootOc != null)
             //{
@@ -422,8 +422,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
 
             leaveRequest.LeaveTypeCode = leaveType.Code;
-            leaveRequest.Dear = approver;
-            leaveRequest.CommanderPosition = profile.CommanderPositionName ?? "";
+            leaveRequest.Dear = req.Commander ?? "";
+            leaveRequest.CommanderPosition = req.CommanderPositionName ?? "";
 
             // เพิ่มตำแหน่ง
             //leaveRequest.CommanderPosition = req.CommanderPosition ?? "";
@@ -1772,7 +1772,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             else if (role == "ROOT")
             {
                 nodeId = profileAdmin?.RootDnaId;
-            }    
+            }
 
             var rawData =
                 await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node);
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs
index b8cc2c03..21ceea77 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs
@@ -102,7 +102,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
         public DateTime? CoupleDayEndDateHistory { get; set; }
 
         public string? CoupleDaySumTotalHistory { get; set; }
+
+        public string? Commander { get; set; }
+
+        public string? CommanderPositionName { get; set; }
     }
 
-    
+
 }