Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

This commit is contained in:
Kittapath 2024-03-15 10:50:32 +07:00
commit 1e465d049c

View file

@ -229,14 +229,14 @@ export class EmployeePositionController extends Controller {
async GetEmpPosition(@Query("keyword") keyword?: string, @Query("type") type?: string) {
let findData: any;
switch (type) {
case "posDictName":
case "positionName":
findData = await this.employeePosDictRepository.find({
where: { posDictName: Like(`%${keyword}%`) },
relations: ["posType", "posLevel"],
});
break;
case "posTypeName":
case "positionType":
const findEmpTypes: EmployeePosType[] = await this.employeePosTypeRepository.find({
where: { posTypeName: Like(`%${keyword}%`) },
select: ["id"],
@ -247,7 +247,7 @@ export class EmployeePositionController extends Controller {
});
break;
case "posLevelName":
case "positionLevel":
if (!isNaN(Number(keyword))) {
const findEmpLevels: EmployeePosLevel[] = await this.employeePosLevelRepository.find({
where: { posLevelName: Number(keyword) },