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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-01-13 17:02:31 +07:00
commit 13d202850a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -534,8 +534,8 @@ namespace BMA.EHR.Application.Repositories
revisionId = revisionId, revisionId = revisionId,
reqNode = reqNode, reqNode = reqNode,
reqNodeId = reqNodeId, reqNodeId = reqNodeId,
startDate = startDate, //startDate = startDate,
endDate = endDate //endDate = endDate
}; };
var profiles = new List<SearchProfileDto>(); var profiles = new List<SearchProfileDto>();

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

@ -1045,7 +1045,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (type.Trim().ToUpper() == "OFFICER") if (type.Trim().ToUpper() == "OFFICER")
{ {
profile = await _userProfileRepository.GetProfileByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date); profile = await _userProfileRepository.GetProfileByAdminRolev4(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
} }
else else
{ {