Merge branch 'develop' into working
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m23s
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m23s
This commit is contained in:
commit
127909d29d
2 changed files with 3 additions and 3 deletions
|
|
@ -534,8 +534,8 @@ namespace BMA.EHR.Application.Repositories
|
|||
revisionId = revisionId,
|
||||
reqNode = reqNode,
|
||||
reqNodeId = reqNodeId,
|
||||
startDate = startDate,
|
||||
endDate = endDate
|
||||
//startDate = startDate,
|
||||
//endDate = endDate
|
||||
};
|
||||
|
||||
var profiles = new List<SearchProfileDto>();
|
||||
|
|
|
|||
|
|
@ -1045,7 +1045,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
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
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue