Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
This commit is contained in:
commit
1e465d049c
1 changed files with 3 additions and 3 deletions
|
|
@ -229,14 +229,14 @@ export class EmployeePositionController extends Controller {
|
||||||
async GetEmpPosition(@Query("keyword") keyword?: string, @Query("type") type?: string) {
|
async GetEmpPosition(@Query("keyword") keyword?: string, @Query("type") type?: string) {
|
||||||
let findData: any;
|
let findData: any;
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "posDictName":
|
case "positionName":
|
||||||
findData = await this.employeePosDictRepository.find({
|
findData = await this.employeePosDictRepository.find({
|
||||||
where: { posDictName: Like(`%${keyword}%`) },
|
where: { posDictName: Like(`%${keyword}%`) },
|
||||||
relations: ["posType", "posLevel"],
|
relations: ["posType", "posLevel"],
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "posTypeName":
|
case "positionType":
|
||||||
const findEmpTypes: EmployeePosType[] = await this.employeePosTypeRepository.find({
|
const findEmpTypes: EmployeePosType[] = await this.employeePosTypeRepository.find({
|
||||||
where: { posTypeName: Like(`%${keyword}%`) },
|
where: { posTypeName: Like(`%${keyword}%`) },
|
||||||
select: ["id"],
|
select: ["id"],
|
||||||
|
|
@ -247,7 +247,7 @@ export class EmployeePositionController extends Controller {
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "posLevelName":
|
case "positionLevel":
|
||||||
if (!isNaN(Number(keyword))) {
|
if (!isNaN(Number(keyword))) {
|
||||||
const findEmpLevels: EmployeePosLevel[] = await this.employeePosLevelRepository.find({
|
const findEmpLevels: EmployeePosLevel[] = await this.employeePosLevelRepository.find({
|
||||||
where: { posLevelName: Number(keyword) },
|
where: { posLevelName: Number(keyword) },
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue