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

ถ้ามีรักษาการแก้สิทธิ์ BROTHER
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m58s
Details

Browse source
This commit is contained in:
harid 2026-04-20 16:38:58 +07:00
parent c035c13405
commit 04d0067ee8
2 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3246,23 +3246,25 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
else if (actRole == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
act.child2DnaId != null ? act.child3DnaId != null ?
act.child2DnaId.Value.ToString("D") : act.child2DnaId.Value.ToString("D") :
act.child1DnaId != null ? act.child2DnaId != null ?
act.rootDnaId!.Value.ToString("D") : act.child1DnaId!.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId.Value.ToString("D") :
act.rootDnaId != null ? act.rootDnaId != null ?
act.rootDnaId.Value.ToString("D") : act.rootDnaId.Value.ToString("D") :
""; "";
actNode = act.child4DnaId != null ? actNode = act.child4DnaId != null ?
4 : 4 :
act.child3DnaId != null ? act.child3DnaId != null ?
4 :
act.child2DnaId != null ?
3 : 3 :
act.child1DnaId != null ? act.child2DnaId != null ?
2 : 2 :
act.child1DnaId != null ?
1 :
act.rootDnaId != null ? act.rootDnaId != null ?
0 : 0 :
null; null;

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

@ -1433,23 +1433,25 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
else if (actRole == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
act.child2DnaId != null ? act.child3DnaId != null ?
act.child2DnaId.Value.ToString("D") : act.child2DnaId.Value.ToString("D") :
act.child1DnaId != null ? act.child2DnaId != null ?
act.rootDnaId!.Value.ToString("D") : act.child1DnaId!.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId.Value.ToString("D") :
act.rootDnaId != null ? act.rootDnaId != null ?
act.rootDnaId.Value.ToString("D") : act.rootDnaId.Value.ToString("D") :
""; "";
actNode = act.child4DnaId != null ? actNode = act.child4DnaId != null ?
4 : 4 :
act.child3DnaId != null ? act.child3DnaId != null ?
4 :
act.child2DnaId != null ?
3 : 3 :
act.child1DnaId != null ? act.child2DnaId != null ?
2 : 2 :
act.child1DnaId != null ?
1 :
act.rootDnaId != null ? act.rootDnaId != null ?
0 : 0 :
null; null;
@ -1911,23 +1913,25 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
else if (actRole == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
act.child2DnaId != null ? act.child3DnaId != null ?
act.child2DnaId.Value.ToString("D") : act.child2DnaId.Value.ToString("D") :
act.child1DnaId != null ? act.child2DnaId != null ?
act.rootDnaId!.Value.ToString("D") : act.child1DnaId!.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId.Value.ToString("D") :
act.rootDnaId != null ? act.rootDnaId != null ?
act.rootDnaId.Value.ToString("D") : act.rootDnaId.Value.ToString("D") :
""; "";
actNode = act.child4DnaId != null ? actNode = act.child4DnaId != null ?
4 : 4 :
act.child3DnaId != null ? act.child3DnaId != null ?
4 :
act.child2DnaId != null ?
3 : 3 :
act.child1DnaId != null ? act.child2DnaId != null ?
2 : 2 :
act.child1DnaId != null ?
1 :
act.rootDnaId != null ? act.rootDnaId != null ?
0 : 0 :
null; null;
@ -2214,23 +2218,25 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
else if (actRole == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
act.child2DnaId != null ? act.child3DnaId != null ?
act.child2DnaId.Value.ToString("D") : act.child2DnaId.Value.ToString("D") :
act.child1DnaId != null ? act.child2DnaId != null ?
act.rootDnaId!.Value.ToString("D") : act.child1DnaId!.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId.Value.ToString("D") :
act.rootDnaId != null ? act.rootDnaId != null ?
act.rootDnaId.Value.ToString("D") : act.rootDnaId.Value.ToString("D") :
""; "";
actNode = act.child4DnaId != null ? actNode = act.child4DnaId != null ?
4 : 4 :
act.child3DnaId != null ? act.child3DnaId != null ?
4 :
act.child2DnaId != null ?
3 : 3 :
act.child1DnaId != null ? act.child2DnaId != null ?
2 : 2 :
act.child1DnaId != null ?
1 :
act.rootDnaId != null ? act.rootDnaId != null ?
0 : 0 :
null; null;