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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
kittapath 2024-12-20 12:01:09 +07:00
commit 8b5f8746b2
5 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/CommandController.ts
View file

@ -1734,12 +1734,14 @@ export class CommandController extends Controller {
});
}
commandRecive.amount = salaryData ? salaryData.amount : null_;
commandRecive.amountSpecial = salaryData ? salaryData.amountSpecial : null_;
commandRecive.positionSalaryAmount = salaryData
? salaryData.positionSalaryAmount
: null_;
commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_;
} else {
commandRecive.amount = null_;
commandRecive.amountSpecial = null_;
commandRecive.positionSalaryAmount = null_;
commandRecive.mouthSalaryAmount = null_;
}

1
src/controllers/ProfileController.ts
View file

@ -4863,6 +4863,7 @@ export class ProfileController extends Controller {
node: null,
nodeId: null,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null
};
if (_profile.child4Id != null) {

2
src/controllers/ProfileDevelopmentController.ts
View file

@ -172,7 +172,7 @@ export class ProfileDevelopmentController extends Controller {
summary: null,
point: null,
name: data.name,
achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน1",
achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
achievement5: "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
achievement0: "ไม่ได้ดำเนินการพัฒนา",
isDevelopment70: data.isDevelopment70,

3
src/controllers/ProfileEmployeeController.ts
View file

@ -2064,7 +2064,8 @@ export class ProfileEmployeeController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null,
nodeId: null,
salary: profile.amount,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null
};
return new HttpSuccess(_profile);
}

3
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1866,7 +1866,8 @@ export class ProfileEmployeeTempController extends Controller {
? null
: profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
.orgChild4Name,
salary: profile.amount,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null
};
return new HttpSuccess(_profile);
}