edit permission normal
This commit is contained in:
parent
5451c49dbe
commit
436370312e
16 changed files with 174 additions and 57 deletions
|
|
@ -172,9 +172,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data
|
data = data.Where(x =>
|
||||||
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))))
|
node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
|
||||||
.ToList();
|
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;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -169,10 +169,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data.Where(x =>
|
data = data.Where(x =>
|
||||||
node == 0 ? x.Child1DnaId == null :
|
node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
|
||||||
node == 1 ? x.Child2DnaId == null :
|
node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null :
|
||||||
node == 2 ? x.Child3DnaId == null :
|
node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null :
|
||||||
node == 3 ? x.Child4DnaId == null :
|
node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null :
|
||||||
|
node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
|
||||||
true
|
true
|
||||||
).ToList();
|
).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -279,9 +280,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data
|
data = data.Where(x =>
|
||||||
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))))
|
node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
|
||||||
.ToList();
|
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;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -138,9 +138,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data
|
data = data.Where(x =>
|
||||||
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))))
|
node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
|
||||||
.ToList();
|
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;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -814,8 +814,14 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data_search = data_search
|
data_search = data_search.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList();
|
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
|
var query = data_search
|
||||||
.Select(x => new
|
.Select(x => new
|
||||||
|
|
|
||||||
|
|
@ -330,7 +330,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
var total = insigniaManage.InsigniaManageOrganiations.Where(x => x.OrganizationId != req.OrganizationOrganizationId).Sum(x => x.Total);
|
var total = insigniaManage.InsigniaManageOrganiations.Where(x => x.OrganizationId != req.OrganizationOrganizationId).Sum(x => x.Total);
|
||||||
if (req.Total + total > insigniaManage.Total)
|
if (req.Total + total > insigniaManage.Total)
|
||||||
return Error(GlobalMessages.InsigniaManageOrgLimit);
|
return Error(GlobalMessages.InsigniaManageOrgLimit);
|
||||||
|
|
||||||
var ocData = _userProfileRepository.GetOc(req.OrganizationOrganizationId, 0, AccessToken);
|
var ocData = _userProfileRepository.GetOc(req.OrganizationOrganizationId, 0, AccessToken);
|
||||||
var root = ocData?.Root ?? null;
|
var root = ocData?.Root ?? null;
|
||||||
var rootDnaId = ocData?.RootDnaId ?? null;
|
var rootDnaId = ocData?.RootDnaId ?? null;
|
||||||
|
|
@ -714,8 +714,14 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
rawData = rawData
|
rawData = rawData.Where(x =>
|
||||||
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))).ToList();
|
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
|
var data = rawData
|
||||||
|
|
@ -993,8 +999,14 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
rawData = rawData
|
rawData = rawData.Where(x =>
|
||||||
.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true)))).ToList();
|
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
|
var data = rawData
|
||||||
|
|
|
||||||
|
|
@ -229,15 +229,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementAppointments = placementAppointments
|
placementAppointments = placementAppointments.Where(x =>
|
||||||
.Where(x =>
|
node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null :
|
||||||
(node == 0 && x.child1DnaId == null && x.rootDnaId == nodeId) ||
|
node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null :
|
||||||
(node == 1 && x.child1DnaId != null && x.child2DnaId == null && x.child1DnaId == nodeId) ||
|
node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null :
|
||||||
(node == 2 && x.child2DnaId != null && x.child3DnaId == null && x.child2DnaId == nodeId) ||
|
node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null :
|
||||||
(node == 3 && x.child3DnaId != null && x.child4DnaId == null && x.child3DnaId == nodeId) ||
|
node == 4 ? x.child4DnaId == nodeId :
|
||||||
(node == 4 && x.child4DnaId == nodeId)
|
true
|
||||||
)
|
).ToList();
|
||||||
.ToList();
|
|
||||||
}
|
}
|
||||||
return Success(placementAppointments);
|
return Success(placementAppointments);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -222,8 +222,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementAppointments = placementAppointments
|
placementAppointments = placementAppointments.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList();
|
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);
|
return Success(placementAppointments);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -183,8 +183,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementOfficers = placementOfficers
|
placementOfficers = placementOfficers.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(placementOfficers);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,8 +221,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementReceives = placementReceives
|
placementReceives = placementReceives.Where(x =>
|
||||||
.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();
|
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);
|
return Success(placementReceives);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -188,8 +188,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementRepatriations = placementRepatriations
|
placementRepatriations = placementRepatriations.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(placementRepatriations);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -274,8 +274,14 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
placementTransfers = placementTransfers
|
placementTransfers = placementTransfers.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(placementTransfers);
|
||||||
|
|
|
||||||
|
|
@ -167,8 +167,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementDeceaseds = retirementDeceaseds
|
retirementDeceaseds = retirementDeceaseds.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList();
|
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);
|
return Success(retirementDeceaseds);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -217,8 +217,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementOthers = retirementOthers
|
retirementOthers = retirementOthers.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementOthers);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -198,8 +198,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementOuts = retirementOuts
|
retirementOuts = retirementOuts.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementOuts);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -324,8 +324,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementResigns = retirementResigns
|
retirementResigns = retirementResigns.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementResigns);
|
||||||
|
|
@ -432,8 +438,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementResigns = retirementResigns
|
retirementResigns = retirementResigns.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementResigns);
|
||||||
|
|
@ -2197,8 +2209,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data
|
data = data.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList();
|
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);
|
return Success(data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -263,8 +263,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementResignEmployees = retirementResignEmployees
|
retirementResignEmployees = retirementResignEmployees.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementResignEmployees);
|
||||||
|
|
@ -370,8 +376,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
retirementResignEmployees = retirementResignEmployees
|
retirementResignEmployees = retirementResignEmployees.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaOldId == null : (node == 1 ? x.child2DnaOldId == null : (node == 2 ? x.child3DnaOldId == null : (node == 3 ? x.child4DnaOldId == null : true)))).ToList();
|
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);
|
return Success(retirementResignEmployees);
|
||||||
|
|
@ -2113,8 +2125,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
else if (role == "NORMAL")
|
else if (role == "NORMAL")
|
||||||
{
|
{
|
||||||
data = data
|
data = data.Where(x =>
|
||||||
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList();
|
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);
|
return Success(data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue