fix รายการลาออกลูกจ้างข้อมูลเงินเดือนไม่แสดง
This commit is contained in:
parent
be2b1fa161
commit
84ebb4a11b
5 changed files with 8 additions and 3 deletions
|
|
@ -1734,12 +1734,14 @@ export class CommandController extends Controller {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
commandRecive.amount = salaryData ? salaryData.amount : null_;
|
commandRecive.amount = salaryData ? salaryData.amount : null_;
|
||||||
|
commandRecive.amountSpecial = salaryData ? salaryData.amountSpecial : null_;
|
||||||
commandRecive.positionSalaryAmount = salaryData
|
commandRecive.positionSalaryAmount = salaryData
|
||||||
? salaryData.positionSalaryAmount
|
? salaryData.positionSalaryAmount
|
||||||
: null_;
|
: null_;
|
||||||
commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_;
|
commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_;
|
||||||
} else {
|
} else {
|
||||||
commandRecive.amount = null_;
|
commandRecive.amount = null_;
|
||||||
|
commandRecive.amountSpecial = null_;
|
||||||
commandRecive.positionSalaryAmount = null_;
|
commandRecive.positionSalaryAmount = null_;
|
||||||
commandRecive.mouthSalaryAmount = null_;
|
commandRecive.mouthSalaryAmount = null_;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4863,6 +4863,7 @@ export class ProfileController extends Controller {
|
||||||
node: null,
|
node: null,
|
||||||
nodeId: null,
|
nodeId: null,
|
||||||
salary: profile ? profile.amount : null,
|
salary: profile ? profile.amount : null,
|
||||||
|
amountSpecial: profile ? profile.amountSpecial : null
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_profile.child4Id != null) {
|
if (_profile.child4Id != null) {
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ export class ProfileDevelopmentController extends Controller {
|
||||||
summary: null,
|
summary: null,
|
||||||
point: null,
|
point: null,
|
||||||
name: data.name,
|
name: data.name,
|
||||||
achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน1",
|
achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
|
||||||
achievement5: "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
|
achievement5: "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
|
||||||
achievement0: "ไม่ได้ดำเนินการพัฒนา",
|
achievement0: "ไม่ได้ดำเนินการพัฒนา",
|
||||||
isDevelopment70: data.isDevelopment70,
|
isDevelopment70: data.isDevelopment70,
|
||||||
|
|
|
||||||
|
|
@ -2064,7 +2064,8 @@ export class ProfileEmployeeController extends Controller {
|
||||||
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
|
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
|
||||||
node: null,
|
node: null,
|
||||||
nodeId: null,
|
nodeId: null,
|
||||||
salary: profile.amount,
|
salary: profile ? profile.amount : null,
|
||||||
|
amountSpecial: profile ? profile.amountSpecial : null
|
||||||
};
|
};
|
||||||
return new HttpSuccess(_profile);
|
return new HttpSuccess(_profile);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1866,7 +1866,8 @@ export class ProfileEmployeeTempController extends Controller {
|
||||||
? null
|
? null
|
||||||
: profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
|
: profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
|
||||||
.orgChild4Name,
|
.orgChild4Name,
|
||||||
salary: profile.amount,
|
salary: profile ? profile.amount : null,
|
||||||
|
amountSpecial: profile ? profile.amountSpecial : null
|
||||||
};
|
};
|
||||||
return new HttpSuccess(_profile);
|
return new HttpSuccess(_profile);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue