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 2025-05-06 19:15:01 +07:00
commit 4d500fcdcd
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -331,18 +331,25 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
if (endDate != DateTime.MinValue) if (endDate != DateTime.MinValue)
rawData = rawData.Where(x => x.LeaveEndDate <= endDate); rawData = rawData.Where(x => x.LeaveEndDate <= endDate);
if (role == "OWNER")
{
node = null;
}
if (role == "OWNER" || role == "CHILD") if (role == "OWNER" || role == "CHILD")
{ {
rawData = rawData rawData = rawData
.Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true)))))); .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))));
} }
else else if (role == "ROOT")
{ {
rawData = rawData rawData = rawData
//.Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId) : (node == null ? true : true))))))
//.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))));
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
} }
else if (role == "NORMAL")
{
rawData = rawData
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))));
}
return await rawData.ToListAsync(); return await rawData.ToListAsync();

4
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1586,7 +1586,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var nodeId = string.Empty; var nodeId = string.Empty;
var profileAdmin = new GetUserOCAllDto(); var profileAdmin = new GetUserOCAllDto();
profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken); profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
if (role == "OWNER" || role == "CHILD") if (role == "NORMAL" || role == "CHILD")
{ {
nodeId = profileAdmin?.Node == 4 nodeId = profileAdmin?.Node == 4
? profileAdmin?.Child4DnaId ? profileAdmin?.Child4DnaId
@ -1600,7 +1600,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else else if (role == "ROOT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }