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

Merge branch 'adiDev' into develop

Browse source 
# Conflicts:
#	src/controllers/SalaryController.ts
This commit is contained in:
AdisakKanthawilang 2024-03-08 16:43:19 +07:00
commit f945a5a864
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/SalaryController.ts
View file

@ -274,12 +274,12 @@ export class Salary extends Controller {
relations: ["posLevel_", "posType_"],
order: {
// startDate: "DESC",
isActive: "ASC",
isActive: "DESC",
posType_: {
posTypeRank: "ASC"
posTypeRank: "DESC"
},
posLevel_: {
posLevelRank: "ASC"
posLevelRank: "DESC"
},
},
...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
@ -344,7 +344,6 @@ export class Salary extends Controller {
@Body() body: { id: string },
@Request() request: { user: Record<string, any> },
) {
// try {
const salary = await this.salaryRepository.findOne({
relations: ["posLevel_", "posType_", "salaryRanks_"],
where: { id: body.id },
@ -370,8 +369,5 @@ export class Salary extends Controller {
);
return new HttpSuccess({ id: newSalary.id });
// } catch (error: any) {
// throw new Error(error);
// }
}
}