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

no message

Browse source
This commit is contained in:
kittapath 2024-12-27 00:17:02 +07:00
parent 38d149c213
commit 935e6e5a4b
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -946,7 +946,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.posTypeNameOld = org.result.posTypeName;
retirementResign.posLevelOldId = org.result.posLevelId;
retirementResign.posLevelNameOld = org.result.posLevelName;
retirementResign.AmountOld = org.result.salary;
retirementResign.PositionOld = org.result.position;
retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName;
@ -2394,7 +2394,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -2577,7 +2578,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,

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

@ -889,7 +889,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.posTypeNameOld = org.result.posTypeName;
retirementResignEmployee.posLevelOldId = org.result.posLevelId;
retirementResignEmployee.posLevelNameOld = org.result.posLevelName;
retirementResignEmployee.AmountOld = org.result.salary;
retirementResignEmployee.PositionOld = org.result.position;
retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
@ -2337,7 +2337,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,
@ -2520,7 +2521,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
No = _null,