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

edit display org
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
kittapath 2025-01-22 15:10:34 +07:00
parent 50b3dde54e
commit 92e6d1ebfc
14 changed files with 181 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -894,10 +894,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementResignEmployee.OrganizationPositionOld = org.result.position + "/" + retirementResignEmployee.OrganizationOld;
}
@ -2500,13 +2500,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = p.OrganizationPositionOld ?? "-",
Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null
? p.PositionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
p.child3Old != null
? p.PositionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
p.child2Old != null
? p.PositionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
p.child1Old != null
? p.PositionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child1Old} {p.rootOld}" :
p.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
PositionLevel = p.PositionLevelOld ?? "-",