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.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

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

12
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -112,7 +112,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -227,11 +227,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOthers = retirementOthers
.Where(x => x.rootDnaOldId == nodeId).ToList();
}
else if (role == "PARENT")
{
retirementOthers = retirementOthers
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
// else if (role == "PARENT")
// {
// retirementOthers = retirementOthers
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
// }
else if (role == "NORMAL")
{
retirementOthers = retirementOthers.Where(x =>

12
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -127,7 +127,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -208,11 +208,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOuts = retirementOuts
.Where(x => x.rootDnaOldId == nodeId).ToList();
}
else if (role == "PARENT")
{
retirementOuts = retirementOuts
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
// else if (role == "PARENT")
// {
// retirementOuts = retirementOuts
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
// }
else if (role == "NORMAL")
{
retirementOuts = retirementOuts.Where(x =>

36
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -271,7 +271,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -336,11 +336,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId).ToList();
}
else if (role == "PARENT")
{
retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
// else if (role == "PARENT")
// {
// retirementResigns = retirementResigns
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
// }
else if (role == "NORMAL")
{
retirementResigns = retirementResigns.Where(x =>
@ -403,7 +403,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -467,11 +467,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId).ToList();
}
else if (role == "PARENT")
{
retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
// else if (role == "PARENT")
// {
// retirementResigns = retirementResigns
// .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
// }
else if (role == "NORMAL")
{
retirementResigns = retirementResigns.Where(x =>
@ -2170,7 +2170,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT" || role == "PARENT")
else if (role == "ROOT" /*|| role == "PARENT"*/)
{
nodeId = profileAdmin?.RootDnaId;
}
@ -2228,11 +2228,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 =>

36
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -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 =>