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

38
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -307,11 +307,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
rawData = rawData rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
rawData = rawData // rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
rawData = rawData rawData = rawData
@ -421,11 +421,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
rawData = rawData rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
rawData = rawData // rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
rawData = rawData rawData = rawData
@ -627,11 +627,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
rawData = rawData rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)); .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
rawData = rawData // rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
rawData = rawData rawData = rawData
@ -1692,10 +1692,10 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
{ {
data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList(); data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList(); // data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>

10
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs
View file

@ -185,11 +185,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
data = data data = data
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data // data = data
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null && x.Child1DnaId != Guid.Empty).ToList(); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null && x.Child1DnaId != Guid.Empty).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>

20
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
View file

@ -172,10 +172,10 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
{ {
data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList(); data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList(); // data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>
@ -288,12 +288,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)) .Where(x => x.RootDnaId == Guid.Parse(nodeId!))
.ToList(); .ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data // data = data
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null) // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
.ToList(); // .ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>

12
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs
View file

@ -140,12 +140,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)) .Where(x => x.RootDnaId == Guid.Parse(nodeId!))
.ToList(); .ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data // data = data
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null) // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
.ToList(); // .ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>

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

@ -786,7 +786,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -826,11 +826,11 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
data_search = data_search data_search = data_search
.Where(x => x.rootDnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data_search = data_search // data_search = data_search
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList(); // .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data_search = data_search.Where(x => 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 ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -143,8 +143,8 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
? true ? true
: role == "ROOT" : role == "ROOT"
? x.rootDnaId == nodeId ? x.rootDnaId == nodeId
: role == "PARENT" // : role == "PARENT"
? x.rootDnaId == nodeId && x.child1DnaId != null // ? x.rootDnaId == nodeId && x.child1DnaId != null
: role == "CHILD" : role == "CHILD"
? ( ? (
profileAdmin.Node == 4 ? x.child4DnaId == nodeId : profileAdmin.Node == 4 ? x.child4DnaId == nodeId :

24
BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
View file

@ -639,7 +639,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -724,11 +724,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
rawData = rawData rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
rawData = rawData // rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList(); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
rawData = rawData.Where(x => rawData = rawData.Where(x =>
@ -943,7 +943,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -1026,11 +1026,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
rawData = rawData rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
rawData = rawData // rawData = rawData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList(); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
rawData = rawData.Where(x => rawData = rawData.Where(x =>

12
BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
View file

@ -141,7 +141,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -166,11 +166,11 @@ namespace BMA.EHR.Leave.Service.Controllers
resData = resData resData = resData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList(); .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
resData = resData // resData = resData
.Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList(); // .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
resData = resData resData = resData

10
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -1842,7 +1842,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2151,7 +2151,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2397,7 +2397,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2652,7 +2652,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -3077,7 +3077,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }

10
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -1340,7 +1340,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -1970,7 +1970,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2312,7 +2312,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2757,7 +2757,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2878,7 +2878,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }

6
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1359,7 +1359,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -1757,7 +1757,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -1955,7 +1955,7 @@ namespace BMA.EHR.Leave.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -116,7 +116,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -177,11 +177,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceaseds = retirementDeceaseds retirementDeceaseds = retirementDeceaseds
.Where(x => x.rootDnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementDeceaseds = retirementDeceaseds // retirementDeceaseds = retirementDeceaseds
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList(); // .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementDeceaseds = retirementDeceaseds.Where(x => 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 ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -227,11 +227,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOthers = retirementOthers retirementOthers = retirementOthers
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementOthers = retirementOthers // retirementOthers = retirementOthers
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementOthers = retirementOthers.Where(x => 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 ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -208,11 +208,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOuts = retirementOuts retirementOuts = retirementOuts
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementOuts = retirementOuts // retirementOuts = retirementOuts
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementOuts = retirementOuts.Where(x => 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 ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -336,11 +336,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResigns = retirementResigns retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementResigns = retirementResigns // retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementResigns = retirementResigns.Where(x => retirementResigns = retirementResigns.Where(x =>
@ -403,7 +403,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -467,11 +467,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResigns = retirementResigns retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementResigns = retirementResigns // retirementResigns = retirementResigns
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementResigns = retirementResigns.Where(x => retirementResigns = retirementResigns.Where(x =>
@ -2170,7 +2170,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2228,11 +2228,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
data = data data = data
.Where(x => x.rootDnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data // data = data
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList(); // .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => 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 ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -273,11 +273,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployees = retirementResignEmployees retirementResignEmployees = retirementResignEmployees
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementResignEmployees = retirementResignEmployees // retirementResignEmployees = retirementResignEmployees
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementResignEmployees = retirementResignEmployees.Where(x => retirementResignEmployees = retirementResignEmployees.Where(x =>
@ -340,7 +340,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -403,11 +403,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployees = retirementResignEmployees retirementResignEmployees = retirementResignEmployees
.Where(x => x.rootDnaOldId == nodeId).ToList(); .Where(x => x.rootDnaOldId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
retirementResignEmployees = retirementResignEmployees // retirementResignEmployees = retirementResignEmployees
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList(); // .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
retirementResignEmployees = retirementResignEmployees.Where(x => retirementResignEmployees = retirementResignEmployees.Where(x =>
@ -2078,7 +2078,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId ? profileAdmin?.RootDnaId
: ""; : "";
} }
else if (role == "ROOT" || role == "PARENT") else if (role == "ROOT" /*|| role == "PARENT"*/)
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
@ -2136,11 +2136,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
data = data data = data
.Where(x => x.rootDnaId == nodeId).ToList(); .Where(x => x.rootDnaId == nodeId).ToList();
} }
else if (role == "PARENT") // else if (role == "PARENT")
{ // {
data = data // data = data
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList(); // .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
} // }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
data = data.Where(x => data = data.Where(x =>