From 04d0067ee8e3cae4a82f08a6c1ce6f4abded230d Mon Sep 17 00:00:00 2001 From: harid Date: Mon, 20 Apr 2026 16:38:58 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=A1=E0=B8=B5?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=81=E0=B8=A9=E0=B8=B2=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B8=B4=E0=B8=97?= =?UTF-8?q?=E0=B8=98=E0=B8=B4=E0=B9=8C=20BROTHER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveController.cs | 16 ++++--- .../Controllers/LeaveRequestController.cs | 48 +++++++++++-------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 1bd92859..c77bad95 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -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; diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index bbf49dc8..fca7c27a 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1433,23 +1433,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; @@ -1911,23 +1913,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; @@ -2214,23 +2218,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;