diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index aca7dd6d..80c3cf56 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -328,9 +328,15 @@ export class EmployeePositionController extends Controller { case "positionLevel": if (!isNaN(Number(keyword))) { - const findEmpLevels: EmployeePosLevel[] = await this.employeePosLevelRepository.find({ - where: { posLevelName: Number(keyword) }, - }); + let findEmpLevels; + if(Number(keyword) === 0) { + findEmpLevels = await this.employeePosLevelRepository.find(); + } + else { + findEmpLevels = await this.employeePosLevelRepository.find({ + where: { posLevelName: Number(keyword) }, + }); + } findData = await this.employeePosDictRepository.find({ where: { posLevelId: In(findEmpLevels.map((x) => x.id)) }, relations: ["posType", "posLevel"], diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index b626ba09..ba74d68f 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -672,10 +672,6 @@ export class PositionController extends Controller { case "positionExecutive": const findExecutive: PosExecutive[] = await this.posExecutiveRepository.find({ where: { posExecutiveName: Like(`%${keyword}%`) }, - order: { - // posExecutiveName: "ASC" - posExecutivePriority: "ASC" - }, select: ["id"], }); findPosDict = await this.posDictRepository.find({