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

no message

Browse source
This commit is contained in:
Kittapath 2024-03-18 15:24:28 +07:00
parent 42fd0084aa
commit 5908cac8fa
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/EmployeePositionController.ts
View file

@ -269,6 +269,7 @@ export class EmployeePositionController extends Controller {
findData = await this.employeePosDictRepository.find({ findData = await this.employeePosDictRepository.find({
where: { posDictName: Like(`%${keyword}%`) }, where: { posDictName: Like(`%${keyword}%`) },
relations: ["posType", "posLevel"], relations: ["posType", "posLevel"],
order: { posLevel: { posLevelName: "ASC" } },
}); });
break; break;
@ -280,6 +281,7 @@ export class EmployeePositionController extends Controller {
findData = await this.employeePosDictRepository.find({ findData = await this.employeePosDictRepository.find({
where: { posTypeId: In(findEmpTypes.map((x) => x.id)) }, where: { posTypeId: In(findEmpTypes.map((x) => x.id)) },
relations: ["posType", "posLevel"], relations: ["posType", "posLevel"],
order: { posLevel: { posLevelName: "ASC" } },
}); });
break; break;
@ -291,11 +293,13 @@ export class EmployeePositionController extends Controller {
findData = await this.employeePosDictRepository.find({ findData = await this.employeePosDictRepository.find({
where: { posLevelId: In(findEmpLevels.map((x) => x.id)) }, where: { posLevelId: In(findEmpLevels.map((x) => x.id)) },
relations: ["posType", "posLevel"], relations: ["posType", "posLevel"],
order: { posLevel: { posLevelName: "ASC" } },
}); });
} else { } else {
//กรณีเลือกค้นหาจาก"ระดับชั้นงาน" แต่กรอกไม่ใช่ number ให้ปล่อยมาหมดเลย //กรณีเลือกค้นหาจาก"ระดับชั้นงาน" แต่กรอกไม่ใช่ number ให้ปล่อยมาหมดเลย
findData = await this.employeePosDictRepository.find({ findData = await this.employeePosDictRepository.find({
relations: ["posType", "posLevel"], relations: ["posType", "posLevel"],
order: { posLevel: { posLevelName: "ASC" } },
}); });
} }
break; break;
@ -303,6 +307,7 @@ export class EmployeePositionController extends Controller {
default: default:
findData = await this.employeePosDictRepository.find({ findData = await this.employeePosDictRepository.find({
relations: ["posType", "posLevel"], relations: ["posType", "posLevel"],
order: { posLevel: { posLevelName: "ASC" } },
}); });
break; break;
} }