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

test parent

Browse source
This commit is contained in:
kittapath 2025-10-12 16:51:51 +07:00
parent 84ab5e79d6
commit f97e643ac1
20 changed files with 155 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,14 +104,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementDeceaseds = await _context.RetirementDeceaseds.AsQueryable()
@ -167,7 +163,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementDeceaseds = retirementDeceaseds
.Where(x => x.child1DnaId == nodeId).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{

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

@ -100,14 +100,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementOthers = await _context.RetirementOthers.AsQueryable()
@ -217,7 +213,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementOthers = retirementOthers
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{

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

@ -115,14 +115,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementOuts = await _context.RetirementOuts.AsQueryable()
@ -198,7 +194,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementOuts = retirementOuts
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{

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

@ -257,14 +257,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementResigns = await _context.RetirementResigns.AsQueryable()
@ -324,7 +320,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementResigns = retirementResigns
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{
@ -370,14 +366,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementResigns = await _context.RetirementResignCancels.AsQueryable()
@ -436,7 +428,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementResigns = retirementResigns
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{
@ -2145,14 +2137,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var data = await _context.RetirementQuestions.AsQueryable()
@ -2205,7 +2193,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
data = data
.Where(x => x.child1DnaId == nodeId).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{

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

@ -196,14 +196,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementResignEmployees = await _context.RetirementResignEmployees.AsQueryable()
@ -263,7 +259,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementResignEmployees = retirementResignEmployees
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{
@ -309,15 +305,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var retirementResignEmployees = await _context.RetirementResignEmployeeCancels.AsQueryable()
@ -375,7 +366,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
retirementResignEmployees = retirementResignEmployees
.Where(x => x.child1DnaOldId == nodeId).ToList();
.Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
}
else if (role == "NORMAL")
{
@ -2062,14 +2053,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
? profileAdmin?.RootDnaId
: "";
}
else if (role == "ROOT")
else if (role == "ROOT" && role == "PARENT")
{
nodeId = profileAdmin?.RootDnaId;
}
else if (role == "PARENT")
{
nodeId = profileAdmin?.Child1DnaId;
}
var node = profileAdmin?.Node;
var data = await _context.RetirementEmployeeQuestions.AsQueryable()
@ -2122,7 +2109,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
else if (role == "PARENT")
{
data = data
.Where(x => x.child1DnaId == nodeId).ToList();
.Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
}
else if (role == "NORMAL")
{