diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs index 0b4c9745..68d4f32a 100644 --- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs @@ -172,9 +172,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants } else if (role == "NORMAL") { - data = data - .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))) - .ToList(); + data = data.Where(x => + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : + true + ).ToList(); } return data; } diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs index 3607e624..bc517b13 100644 --- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs @@ -169,10 +169,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants else if (role == "NORMAL") { data = data.Where(x => - node == 0 ? x.Child1DnaId == null : - node == 1 ? x.Child2DnaId == null : - node == 2 ? x.Child3DnaId == null : - node == 3 ? x.Child4DnaId == null : + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : true ).ToList(); } @@ -279,9 +280,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants } else if (role == "NORMAL") { - data = data - .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))) - .ToList(); + data = data.Where(x => + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : + true + ).ToList(); } return data; } diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs index 919f9e94..a5415537 100644 --- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs @@ -138,9 +138,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants } else if (role == "NORMAL") { - data = data - .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))) - .ToList(); + data = data.Where(x => + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : + true + ).ToList(); } return data; } diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs index a48dc687..bd5e3134 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs @@ -814,8 +814,14 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers } else if (role == "NORMAL") { - data_search = data_search - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + data_search = data_search.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } var query = data_search .Select(x => new diff --git a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs index cf4abb90..30b3f6d8 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs @@ -330,7 +330,7 @@ namespace BMA.EHR.Insignia.Service.Controllers var total = insigniaManage.InsigniaManageOrganiations.Where(x => x.OrganizationId != req.OrganizationOrganizationId).Sum(x => x.Total); if (req.Total + total > insigniaManage.Total) return Error(GlobalMessages.InsigniaManageOrgLimit); - + var ocData = _userProfileRepository.GetOc(req.OrganizationOrganizationId, 0, AccessToken); var root = ocData?.Root ?? null; var rootDnaId = ocData?.RootDnaId ?? null; @@ -714,8 +714,14 @@ namespace BMA.EHR.Insignia.Service.Controllers } else if (role == "NORMAL") { - rawData = rawData - .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))).ToList(); + rawData = rawData.Where(x => + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : + true + ).ToList(); } var data = rawData @@ -993,8 +999,14 @@ namespace BMA.EHR.Insignia.Service.Controllers } else if (role == "NORMAL") { - rawData = rawData - .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))).ToList(); + rawData = rawData.Where(x => + node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null : + node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null : + node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null : + node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null : + node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : + true + ).ToList(); } var data = rawData diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index c70567db..cae89c51 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -229,15 +229,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementAppointments = placementAppointments - .Where(x => - (node == 0 && x.child1DnaId == null && x.rootDnaId == nodeId) || - (node == 1 && x.child1DnaId != null && x.child2DnaId == null && x.child1DnaId == nodeId) || - (node == 2 && x.child2DnaId != null && x.child3DnaId == null && x.child2DnaId == nodeId) || - (node == 3 && x.child3DnaId != null && x.child4DnaId == null && x.child3DnaId == nodeId) || - (node == 4 && x.child4DnaId == nodeId) - ) - .ToList(); + placementAppointments = placementAppointments.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(placementAppointments); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index e287bad5..a453c97b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -222,8 +222,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementAppointments = placementAppointments - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + placementAppointments = placementAppointments.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(placementAppointments); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 49c54056..802a65bc 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -183,8 +183,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementOfficers = placementOfficers - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + placementOfficers = placementOfficers.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(placementOfficers); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index ed2258ea..00266c3b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -221,8 +221,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementReceives = placementReceives - .Where(x => (node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))) || (x.CreatedUserId == UserId)).ToList(); + placementReceives = placementReceives.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(placementReceives); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index d65e58ad..f50e4557 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -188,8 +188,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementRepatriations = placementRepatriations - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + placementRepatriations = placementRepatriations.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(placementRepatriations); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 0872c783..a9ce9487 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -274,8 +274,14 @@ namespace BMA.EHR.Placement.Service.Controllers } else if (role == "NORMAL") { - placementTransfers = placementTransfers - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + placementTransfers = placementTransfers.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(placementTransfers); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index abd375af..c04a23e5 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -167,8 +167,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementDeceaseds = retirementDeceaseds - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + retirementDeceaseds = retirementDeceaseds.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(retirementDeceaseds); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 8ceaf657..4221fe31 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -217,8 +217,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementOthers = retirementOthers - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementOthers = retirementOthers.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementOthers); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index b6af6e7b..2e0f81f2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -198,8 +198,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementOuts = retirementOuts - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementOuts = retirementOuts.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementOuts); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 14b386c1..5a4ccc71 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -324,8 +324,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementResigns = retirementResigns - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementResigns = retirementResigns.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementResigns); @@ -432,8 +438,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementResigns = retirementResigns - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementResigns = retirementResigns.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementResigns); @@ -2197,8 +2209,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - data = data - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + data = data.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(data); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 54568733..b996fffe 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -263,8 +263,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementResignEmployees = retirementResignEmployees - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementResignEmployees = retirementResignEmployees.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementResignEmployees); @@ -370,8 +376,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - retirementResignEmployees = retirementResignEmployees - .Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList(); + retirementResignEmployees = retirementResignEmployees.Where(x => + node == 0 ? x.rootDnaOldId == nodeId && x.child1DnaOldId == null : + node == 1 ? x.child1DnaOldId == nodeId && x.child2DnaOldId == null : + node == 2 ? x.child2DnaOldId == nodeId && x.child3DnaOldId == null : + node == 3 ? x.child3DnaOldId == nodeId && x.child4DnaOldId == null : + node == 4 ? x.child4DnaOldId == nodeId : + true + ).ToList(); } return Success(retirementResignEmployees); @@ -2113,8 +2125,14 @@ namespace BMA.EHR.Retirement.Service.Controllers } else if (role == "NORMAL") { - data = data - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + data = data.Where(x => + node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null : + node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null : + node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null : + node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null : + node == 4 ? x.child4DnaId == nodeId : + true + ).ToList(); } return Success(data); }