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

test parent

Browse source
This commit is contained in:
kittapath 2025-10-12 16:51:51 +07:00
parent 84ab5e79d6
commit f97e643ac1
20 changed files with 155 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -99,14 +99,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementAppointments = await _context.PlacementAppointments.AsQueryable()
@ -228,7 +224,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementAppointments = placementAppointments
.Where(x => x.child1DnaId == nodeId).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -98,14 +98,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementAppointments = await _context.PlacementAppointments.AsQueryable()
@ -222,7 +218,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementAppointments = placementAppointments
.Where(x => x.child1DnaId == nodeId).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{

8
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -99,14 +99,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementOfficers = await _context.PlacementOfficers.AsQueryable()
@ -183,7 +179,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementOfficers = placementOfficers
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{

8
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -100,14 +100,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementReceives = await _context.PlacementReceives.AsQueryable()
@ -221,7 +217,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementReceives = placementReceives
.Where(x => (x.child1DnaId == nodeId) || (x.CreatedUserId == UserId)).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{

8
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -100,14 +100,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementRepatriations = await _context.PlacementRepatriations.AsQueryable()
@ -188,7 +184,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementRepatriations = placementRepatriations
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{

8
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -192,14 +192,10 @@ namespace BMA.EHR.Placement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var placementTransfers = await _context.PlacementTransfers.AsQueryable()
@ -274,7 +270,7 @@ namespace BMA.EHR.Placement.Service.Controllers
else if (role == "PARENT")
{
placementTransfers = placementTransfers
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{