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

แก้ไข

Browse source 
ถ้าไม่ได้ Add สิทธิ์มา จะข้ามตำแหน่งนั้นไป
แก้บั้กการแสดงข้อมูล กรณี "ROOT"

#2431
This commit is contained in:
Suphonchai Phoonsawat 2026-04-20 11:42:41 +07:00
parent 058027ea29
commit 883a3923a9
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Domain/Shared/PrivilegeConverter.cs
View file

@ -17,7 +17,7 @@ namespace BMA.EHR.Domain.Shared
{ {
if (reader.TokenType == JsonToken.Null) if (reader.TokenType == JsonToken.Null)
{ {
return "CHILD"; return "EMPTY";
} }
return reader.Value; return reader.Value;
} }

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

@ -3212,14 +3212,14 @@ namespace BMA.EHR.Leave.Service.Controllers
// ถ้ามีการรักษาการ // ถ้ามีการรักษาการ
if (jsonData.result.isAct) if (jsonData.result.isAct)
{ {
var posActs = jsonData.result.posMasterActs; var posActs = jsonData.result.posMasterActs.Where(x => x.privilege != "EMPTY");
foreach(var act in posActs) foreach(var act in posActs)
{ {
var actRole = act.privilege; var actRole = act.privilege;
string actNodeId = string.Empty; string actNodeId = string.Empty;
int? actNode; int? actNode;
if (role == "NORMAL" || role == "CHILD") if (actRole == "NORMAL" || actRole == "CHILD")
{ {
actNodeId = act.child4DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child4DnaId.Value.ToString("D") : act.child4DnaId.Value.ToString("D") :
@ -3244,7 +3244,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child3DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
@ -3267,7 +3267,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "ROOT" /*|| role == "PARENT"*/) else if (actRole == "ROOT" /*|| role == "PARENT"*/)
{ {
actNodeId = act.rootDnaId!.Value.ToString("D"); actNodeId = act.rootDnaId!.Value.ToString("D");
actNode = 0; actNode = 0;
@ -3277,7 +3277,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (rawDataAct != null) if (rawDataAct != null)
{ {
if (rawData != null) if (rawData != null)
rawData = rawData.Union(rawDataAct).ToList(); rawData = rawData.Union(rawDataAct).DistinctBy(x => x.Id).ToList();
else else
rawData = rawDataAct; rawData = rawDataAct;
} }

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

@ -1399,14 +1399,14 @@ namespace BMA.EHR.Leave.Service.Controllers
// ถ้ามีการรักษาการ // ถ้ามีการรักษาการ
if (jsonData.result.isAct) if (jsonData.result.isAct)
{ {
var posActs = jsonData.result.posMasterActs; var posActs = jsonData.result.posMasterActs.Where(x => x.privilege != "EMPTY");
foreach(var act in posActs) foreach(var act in posActs)
{ {
var actRole = act.privilege; var actRole = act.privilege;
string actNodeId = string.Empty; string actNodeId = string.Empty;
int? actNode = null; int? actNode = null;
if (role == "NORMAL" || role == "CHILD") if (actRole == "NORMAL" || actRole == "CHILD")
{ {
actNodeId = act.child4DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child4DnaId.Value.ToString("D") : act.child4DnaId.Value.ToString("D") :
@ -1431,7 +1431,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child3DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
@ -1454,7 +1454,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "ROOT" /*|| role == "PARENT"*/) else if (actRole == "ROOT" /*|| role == "PARENT"*/)
{ {
actNodeId = act.rootDnaId!.Value.ToString("D"); actNodeId = act.rootDnaId!.Value.ToString("D");
actNode = 0; actNode = 0;
@ -1464,7 +1464,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (rawDataAct != null) if (rawDataAct != null)
{ {
if (data != null) if (data != null)
data = data.Union(rawDataAct).ToList(); data = data.Union(rawDataAct).DistinctBy(x => x.Id).ToList();
else else
data = rawDataAct; data = rawDataAct;
} }
@ -1877,14 +1877,14 @@ namespace BMA.EHR.Leave.Service.Controllers
// ถ้ามีการรักษาการ // ถ้ามีการรักษาการ
if (jsonData.result.isAct) if (jsonData.result.isAct)
{ {
var posActs = jsonData.result.posMasterActs; var posActs = jsonData.result.posMasterActs.Where(x => x.privilege != "EMPTY");
foreach(var act in posActs) foreach(var act in posActs)
{ {
var actRole = act.privilege; var actRole = act.privilege;
string actNodeId = string.Empty; string actNodeId = string.Empty;
int? actNode = null; int? actNode = null;
if (role == "NORMAL" || role == "CHILD") if (actRole == "NORMAL" || actRole == "CHILD")
{ {
actNodeId = act.child4DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child4DnaId.Value.ToString("D") : act.child4DnaId.Value.ToString("D") :
@ -1909,7 +1909,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child3DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
@ -1932,7 +1932,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "ROOT" /*|| role == "PARENT"*/) else if (actRole == "ROOT" /*|| role == "PARENT"*/)
{ {
actNodeId = act.rootDnaId!.Value.ToString("D"); actNodeId = act.rootDnaId!.Value.ToString("D");
actNode = 0; actNode = 0;
@ -1942,7 +1942,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (rawDataAct != null) if (rawDataAct != null)
{ {
if (rawData != null) if (rawData != null)
rawData = rawData.Union(rawDataAct).ToList(); rawData = rawData.Union(rawDataAct).DistinctBy(x => x.Id).ToList();
else else
rawData = rawDataAct; rawData = rawDataAct;
} }
@ -2180,14 +2180,14 @@ namespace BMA.EHR.Leave.Service.Controllers
// ถ้ามีการรักษาการ // ถ้ามีการรักษาการ
if (jsonData.result.isAct) if (jsonData.result.isAct)
{ {
var posActs = jsonData.result.posMasterActs; var posActs = jsonData.result.posMasterActs.Where(x => x.privilege != "EMPTY");
foreach(var act in posActs) foreach(var act in posActs)
{ {
var actRole = act.privilege; var actRole = act.privilege;
string actNodeId = string.Empty; string actNodeId = string.Empty;
int? actNode = null; int? actNode = null;
if (role == "NORMAL" || role == "CHILD") if (actRole == "NORMAL" || actRole == "CHILD")
{ {
actNodeId = act.child4DnaId != null ? actNodeId = act.child4DnaId != null ?
act.child4DnaId.Value.ToString("D") : act.child4DnaId.Value.ToString("D") :
@ -2212,7 +2212,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "BROTHER") else if (actRole == "BROTHER")
{ {
actNodeId = act.child3DnaId != null ? actNodeId = act.child3DnaId != null ?
act.child3DnaId.Value.ToString("D") : act.child3DnaId.Value.ToString("D") :
@ -2235,7 +2235,7 @@ namespace BMA.EHR.Leave.Service.Controllers
0 : 0 :
null; null;
} }
else if (role == "ROOT" /*|| role == "PARENT"*/) else if (actRole == "ROOT" /*|| role == "PARENT"*/)
{ {
actNodeId = act.rootDnaId!.Value.ToString("D"); actNodeId = act.rootDnaId!.Value.ToString("D");
actNode = 0; actNode = 0;
@ -2245,7 +2245,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (rawDataAct != null) if (rawDataAct != null)
{ {
if (rawData != null) if (rawData != null)
rawData = rawData.Union(rawDataAct).ToList(); rawData = rawData.Union(rawDataAct).DistinctBy(x => x.Id).ToList();
else else
rawData = rawDataAct; rawData = rawDataAct;
} }