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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-07-18 09:36:50 +07:00
commit 6868327430
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileSalaryTempController.ts
View file

@ -1130,7 +1130,7 @@ export class ProfileSalaryTempController extends Controller {
order: { order: "DESC" },
});
if (salary) {
dest_item = salary.order;
dest_item = salary.order+1;
}
// const profile = await this.profileRepo.findOneBy({ id: body.profileId });
// if (!profile) {
@ -1148,7 +1148,7 @@ export class ProfileSalaryTempController extends Controller {
order: { order: "DESC" },
});
if (salary) {
dest_item = salary.order;
dest_item = salary.order+1;
}
// const profile = await this.profileEmployeeRepo.findOneBy({ id: body.profileId });
// if (!profile) {

2
src/interfaces/utils.ts
View file

@ -615,6 +615,8 @@ export function commandTypePath(commandCode: string): string | null {
return "/salary/report/command35/officer/report"; //SALARY
case "C-PM-46":
return "/salary/report/command36/employee/report"; //SALARY
case "C-PM-47":
return "/placement/appointment/gazette/report";
default:
return null;
}