diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index b24b0427..1771cbca 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -13,12 +13,11 @@ using BMA.EHR.Leave.Service.DTOs.LeaveRequest; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json.Linq; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Swashbuckle.AspNetCore.Annotations; -using System.Security.Claims; using System.Net.Http.Headers; -using BMA.EHR.Domain.Models.MetaData; +using System.Security.Claims; namespace BMA.EHR.Leave.Service.Controllers { @@ -987,7 +986,7 @@ namespace BMA.EHR.Leave.Service.Controllers SumDateWork = sumWorkDay, TotalDate = totalDay, SumDateHoliday = sumWeekend, - Message = message, + Message = !isBetween ? message : "ไม่สามารถทำการลาได้ เนื่องจากมีวันลาในช่วงที่เคยทำการขอลาไปแล้ว", }; return Success(result);