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

แก้ไขสิทธิ์ PARENT ให้เห็นข้อมูลทั้งหมดทุกหน่วยงาน #54
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m55s
Details
Build & Deploy Insignia Service / build (push) Successful in 1m48s
Details
Build & Deploy Leave Service / build (push) Successful in 1m49s
Details
Build & Deploy Placement Service / build (push) Successful in 1m46s
Details
Build & Deploy Retirement Service / build (push) Successful in 1m50s
Details

Browse source
This commit is contained in:
harid 2026-02-19 17:01:44 +07:00
parent 869defcc7e
commit 256da24caf
22 changed files with 170 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
View file

@ -786,7 +786,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -826,11 +826,11 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
data_search = data_search
.Where(x => x.rootDnaId == nodeId).ToList();
}
else if (role == "PARENT")
{
data_search = data_search
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
// else if (role == "PARENT")
// {
// data_search = data_search
// .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
// }
else if (role == "NORMAL")
{
data_search = data_search.Where(x =>

6
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -102,7 +102,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -143,8 +143,8 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
? true
: role == "ROOT"
? x.rootDnaId == nodeId
: role == "PARENT"
? x.rootDnaId == nodeId && x.child1DnaId != null
// : role == "PARENT"
// ? x.rootDnaId == nodeId && x.child1DnaId != null
: role == "CHILD"
? (
profileAdmin.Node == 4 ? x.child4DnaId == nodeId :