hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop'
Some checks failed
DockerHub Release - Leave Service / release-to-dockerhub (push) Failing after 11s
Details

Browse source
This commit is contained in:
kittapath 2026-01-02 21:57:09 +07:00
commit a381ff1528
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Application/Repositories/UserProfileRepository.cs
View file

@ -574,6 +574,7 @@ namespace BMA.EHR.Application.Repositories
// endDate = endDate
date = endDate
};
Console.WriteLine(body);
var profiles = new List<SearchProfileDto>();
@ -585,7 +586,7 @@ namespace BMA.EHR.Application.Repositories
return raw.Result;
}
return null;
return new List<GetProfileByKeycloakIdRootDto>();
}
catch
{
@ -983,7 +984,7 @@ namespace BMA.EHR.Application.Repositories
{
try
{
var apiPath = $"{_configuration["API"]}/org/find/all";
var apiPath = $"{_configuration["API"]}/org/find/allv2";
var apiKey = _configuration["API_KEY"];
var body = new
{

2
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -2241,7 +2241,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate()}";
var org = _userProfileRepository.GetOc(Guid.Parse(req.nodeId), req.node, AccessToken);
var organizationName = $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
var organizationName = org == null ? "" : $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
var dateTimeStamp = $"ประจำ ณ วัน{req.StartDate.Date.GetThaiDayOfWeek()} ที่ {req.StartDate.Date.ToThaiShortDate()}{enddate}";
var templatePath = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", "TimeStampRecords.xlsx");