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

Merge branch 'develop' into working
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m44s
Details
Build & Deploy Placement Service / build (push) Successful in 2m8s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-04-23 19:12:24 +07:00
commit c65a4a04ac
13 changed files with 769 additions and 32 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")
{
actNodeId = act.child3DnaId != null ?
actNodeId = act.child4DnaId != null ?
act.child3DnaId.Value.ToString("D") :
act.child2DnaId != null ?
act.child3DnaId != null ?
act.child2DnaId.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId!.Value.ToString("D") :
act.child2DnaId != null ?
act.child1DnaId!.Value.ToString("D") :
act.child1DnaId != null ?
act.rootDnaId.Value.ToString("D") :
act.rootDnaId != null ?
act.rootDnaId.Value.ToString("D") :
"";
actNode = act.child4DnaId != null ?
4 :
act.child3DnaId != null ?
4 :
act.child2DnaId != null ?
3 :
act.child1DnaId != null ?
act.child2DnaId != null ?
2 :
act.child1DnaId != null ?
1 :
act.rootDnaId != null ?
0 :
null;

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

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