แก้ไขสิทธิ์ 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
|
|
@ -208,7 +208,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -273,11 +273,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResignEmployees = retirementResignEmployees
|
||||
.Where(x => x.rootDnaOldId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
retirementResignEmployees = retirementResignEmployees
|
||||
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// retirementResignEmployees = retirementResignEmployees
|
||||
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
retirementResignEmployees = retirementResignEmployees.Where(x =>
|
||||
|
|
@ -340,7 +340,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -403,11 +403,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResignEmployees = retirementResignEmployees
|
||||
.Where(x => x.rootDnaOldId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
retirementResignEmployees = retirementResignEmployees
|
||||
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// retirementResignEmployees = retirementResignEmployees
|
||||
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
retirementResignEmployees = retirementResignEmployees.Where(x =>
|
||||
|
|
@ -2078,7 +2078,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
else if (role == "ROOT" /*|| role == "PARENT"*/)
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
}
|
||||
|
|
@ -2136,11 +2136,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data = data
|
||||
.Where(x => x.rootDnaId == nodeId).ToList();
|
||||
}
|
||||
else if (role == "PARENT")
|
||||
{
|
||||
data = data
|
||||
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
}
|
||||
// else if (role == "PARENT")
|
||||
// {
|
||||
// data = data
|
||||
// .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
|
||||
// }
|
||||
else if (role == "NORMAL")
|
||||
{
|
||||
data = data.Where(x =>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue