From f866435897836b7369c6e41896040fd04c646836 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 25 Feb 2026 16:26:28 +0700 Subject: [PATCH] Refactor LeaveBeginningController to simplify duplicate check and comment out LeaveYear property in EditLeaveBeginningDto #2341 --- BMA.EHR.Leave/Controllers/LeaveBeginningController.cs | 3 +-- BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs index 29ec361e..5e94c1e4 100644 --- a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs @@ -590,8 +590,7 @@ namespace BMA.EHR.Leave.Service.Controllers return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound); } // check duplicate - var oldData = await _context.LeaveBeginnings.Where(x => x.ProfileId == req.ProfileId - && x.LeaveYear == req.LeaveYear).ToListAsync(); + var oldData = await _context.LeaveBeginnings.Where(x => x.ProfileId == req.ProfileId).ToListAsync(); foreach(var item in oldData) { diff --git a/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs b/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs index 03c96a49..524072ec 100644 --- a/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs @@ -51,8 +51,8 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveBeginnings [Required] public Guid ProfileId { get; set; } = Guid.Empty; - [Required, Comment("ปีงบประมาณ")] - public int LeaveYear { get; set; } = 0; + // [Required, Comment("ปีงบประมาณ")] + // public int LeaveYear { get; set; } = 0; public Guid? RootDnaId { get; set; } public Guid? Child1DnaId { get; set; }