diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts index c5b1d3f..6801cf6 100644 --- a/src/controllers/SalaryController.ts +++ b/src/controllers/SalaryController.ts @@ -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 }, ) { - // 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); - // } } }