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

fix แต่งตั้ง-เลื่อน-ย้าย ไม่ส่งเงินเดือนปัจจุบัน

Browse source
This commit is contained in:
Bright 2024-10-15 13:56:29 +07:00
parent cd9f17867a
commit 5dc3e25aca
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileController.ts
View file

@ -3978,7 +3978,12 @@ export class ProfileController extends Controller {
// await new permission().PermissionOrgUserGet(request, "SYS_REGISTRY_OFFICER", id);//ไม่แน่ใจOFFปิดไว้ก่อน // await new permission().PermissionOrgUserGet(request, "SYS_REGISTRY_OFFICER", id);//ไม่แน่ใจOFFปิดไว้ก่อน
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { id: id }, where: { id: id },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot"], relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot", "profileSalary"],
order: {
profileSalary: {
order: "DESC",
}
}
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -4155,6 +4160,7 @@ export class ProfileController extends Controller {
posNo: shortName, posNo: shortName,
isPosmasterAct: data.length > 0, isPosmasterAct: data.length > 0,
posmasterAct: data, posmasterAct: data,
salary: profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
}; };
if (_profile.child4Id != null) { if (_profile.child4Id != null) {

8
src/controllers/ProfileEmployeeController.ts
View file

@ -3705,7 +3705,12 @@ export class ProfileEmployeeController extends Controller {
async getProfileByProfileid(@Request() request: RequestWithUser, @Path() id: string) { async getProfileByProfileid(@Request() request: RequestWithUser, @Path() id: string) {
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { id: id }, where: { id: id },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot"], relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot", "profileSalarys"],
order: {
profileSalarys: {
order: "DESC"
}
}
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -3826,6 +3831,7 @@ export class ProfileEmployeeController extends Controller {
node: null, node: null,
nodeId: null, nodeId: null,
posNo: shortName, posNo: shortName,
salary: profile && profile.profileSalarys.length > 0 ? profile.profileSalarys[0].amount : null
}; };
if (_profile.child4Id != null) { if (_profile.child4Id != null) {