From d310c3384e6c990d8ec7742f149de1381ef9b46b Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 21 May 2024 15:40:03 +0700 Subject: [PATCH] fix filter --- src/controllers/DevelopmentEmployeeHistoryController.ts | 7 +------ src/controllers/DevelopmentHistoryController.ts | 7 ++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index 56dd7fd..c35b617 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -238,12 +238,7 @@ export class DevelopmentEmployeeHistoryController extends Controller { : "1=1", { year: body.year }, ) - .andWhere( - body.root != null && body.root != undefined ? "developmentHistory.root = :root" : "1=1", - { - root: body.root, - }, - ) + .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root }) .andWhere("developmentHistory.type = :type", { type: type }) .andWhere( new Brackets((qb) => { diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 5b8aeb8..b19c1bf 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -230,9 +230,9 @@ export class DevelopmentOfficerHistoryController extends Controller { : "1=1", { year: body.year }, ) - .andWhere(body.root != null && body.root != undefined ? "development.root = :root" : "1=1", { - root: body.root, - }) + // .andWhere(body.root != null && body.root != undefined ? "development.root = :root" : "1=1", { + // root: body.root, + // }) .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root }) .andWhere("developmentHistory.type = :type", { type: type }) .andWhere( @@ -313,6 +313,7 @@ export class DevelopmentOfficerHistoryController extends Controller { fullName: item.prefix + item.firstName + " " + item.lastName, position: item.position, year: item.development.year, + root: item.development.root,//test posType: item.posType ? item.posType.posTypeName : null, posLevel: item.posLevel ? item.posLevel.posLevelName : null, posExecutive: item.posExecutive,