แก้ไขสิทธิ์ PARENT ให้เห็นข้อมูลทั้งหมดทุกหน่วยงาน #54
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m55s
Build & Deploy Insignia Service / build (push) Successful in 1m48s
Build & Deploy Leave Service / build (push) Successful in 1m49s
Build & Deploy Placement Service / build (push) Successful in 1m46s
Build & Deploy Retirement Service / build (push) Successful in 1m50s
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m55s
Build & Deploy Insignia Service / build (push) Successful in 1m48s
Build & Deploy Leave Service / build (push) Successful in 1m49s
Build & Deploy Placement Service / build (push) Successful in 1m46s
Build & Deploy Retirement Service / build (push) Successful in 1m50s
This commit is contained in:
parent
869defcc7e
commit
256da24caf
22 changed files with 170 additions and 170 deletions
|
|
@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -239,11 +239,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementAppointments = placementAppointments
|
||||
.Where(x => x.rootDnaId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementAppointments = placementAppointments
|
||||
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementAppointments = placementAppointments
|
||||
// .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementAppointments = placementAppointments.Where(x =>
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -232,11 +232,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementAppointments = placementAppointments
|
||||
.Where(x => x.rootDnaId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementAppointments = placementAppointments
|
||||
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementAppointments = placementAppointments
|
||||
// .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementAppointments = placementAppointments.Where(x =>
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -193,11 +193,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementOfficers = placementOfficers
|
||||
.Where(x => x.rootDnaOldId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementOfficers = placementOfficers
|
||||
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementOfficers = placementOfficers
|
||||
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementOfficers = placementOfficers.Where(x =>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -231,11 +231,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementReceives = placementReceives
|
||||
.Where(x => (x.rootDnaId == nodeId) || (x.CreatedUserId == UserId)).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementReceives = placementReceives
|
||||
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementReceives = placementReceives
|
||||
// .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementReceives = placementReceives.Where(x =>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -198,11 +198,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementRepatriations = placementRepatriations
|
||||
.Where(x => x.rootDnaOldId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementRepatriations = placementRepatriations
|
||||
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementRepatriations = placementRepatriations
|
||||
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementRepatriations = placementRepatriations.Where(x =>
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -285,11 +285,11 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementTransfers = placementTransfers
|
||||
.Where(x => x.rootDnaOldId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
placementTransfers = placementTransfers
|
||||
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// placementTransfers = placementTransfers
|
||||
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
placementTransfers = placementTransfers.Where(x =>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue