diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 28d1e8f..3e1c2ae 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -6547,6 +6547,7 @@ export class ReportController extends Controller { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, + profileId: item.profileId, })); return new HttpSuccess(_salaryRank); @@ -6592,6 +6593,7 @@ export class ReportController extends Controller { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, + profileId: item.profileId, })); return new HttpSuccess(_salaryRank); @@ -6631,6 +6633,7 @@ export class ReportController extends Controller { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, + profileId: item.profileId, })); return new HttpSuccess(_salaryRank); @@ -6669,6 +6672,7 @@ export class ReportController extends Controller { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, + profileId: item.profileId, })); return new HttpSuccess(_salaryRank); @@ -6707,6 +6711,7 @@ export class ReportController extends Controller { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, + profileId: item.profileId, })); return new HttpSuccess(_salaryRank); diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts index d89e40c..5f168d0 100644 --- a/src/controllers/SalaryController.ts +++ b/src/controllers/SalaryController.ts @@ -280,18 +280,18 @@ export class SalaryController extends Controller { ) { const [salary, total] = await AppDataSource.getRepository(Salarys) .createQueryBuilder("salary") - .leftJoinAndSelect("salary.posType", "posType") - .leftJoinAndSelect("salary.posLevel", "posLevel") + .leftJoinAndSelect("salary.posType_", "posType_") + .leftJoinAndSelect("salary.posLevel_", "posLevel_") .andWhere( new Brackets((qb) => { qb.orWhere("salary.name LIKE :keyword", { keyword: `%${keyword}%` }) - .orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${keyword}%` }) - .orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${keyword}%` }); + .orWhere("posType_.posTypeName LIKE :keyword", { keyword: `%${keyword}%` }) + .orWhere("posLevel_.posLevelName LIKE :keyword", { keyword: `%${keyword}%` }); }), ) .orderBy("salary.isActive", "DESC") - .addOrderBy("posType.posTypeRank", "DESC") - .addOrderBy("posLevel.posLevelRank", "DESC") + .addOrderBy("posType_.posTypeRank", "DESC") + .addOrderBy("posLevel_.posLevelRank", "DESC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); diff --git a/src/controllers/SalaryEmployeeController.ts b/src/controllers/SalaryEmployeeController.ts index 5213ed3..224177f 100644 --- a/src/controllers/SalaryEmployeeController.ts +++ b/src/controllers/SalaryEmployeeController.ts @@ -219,8 +219,6 @@ export class SalaryEmployeeController extends Controller { ) { const [salaryEmployee, total] = await AppDataSource.getRepository(SalaryEmployee) .createQueryBuilder("salaryEmployee") - .leftJoinAndSelect("salaryEmployee.posType", "posType") - .leftJoinAndSelect("salaryEmployee.posLevel", "posLevel") .andWhere( new Brackets((qb) => { qb.orWhere("salaryEmployee.name LIKE :keyword", { keyword: `%${keyword}%` }).orWhere(