From 6ab68394a52fe14aeb882f95c14170cd11b97b1f Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 4 Apr 2024 10:42:29 +0700 Subject: [PATCH] no message --- src/controllers/DevelopmentEmployeeHistoryController.ts | 2 +- src/controllers/DevelopmentHistoryController.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index 2949967..ae36d4e 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -196,7 +196,7 @@ export class DevelopmentEmployeeHistoryController extends Controller { .leftJoinAndSelect("developmentHistory.development", "development") .leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel") .leftJoinAndSelect("developmentHistory.employeePosType", "employeePosType") - .andWhere("development.year = :year", { year: year }) + .andWhere(year != 0 || year != null || year != undefined ? "development.year = :year" : "1=1", { year: year }) .andWhere("developmentHistory.type = :type", { type: type }) .andWhere( new Brackets((qb) => { diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index a905e02..429b4c2 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller { .leftJoinAndSelect("developmentHistory.development", "development") .leftJoinAndSelect("developmentHistory.posLevel", "posLevel") .leftJoinAndSelect("developmentHistory.posType", "posType") - .andWhere(year != 0 || year != null ? "development.year = :year" : "1=1", { year: year }) + .andWhere(year != 0 || year != null || year != undefined ? "development.year = :year" : "1=1", { year: year }) .andWhere("developmentHistory.type = :type", { type: type }) .andWhere( new Brackets((qb) => { @@ -274,6 +274,7 @@ export class DevelopmentOfficerHistoryController extends Controller { position: item.position, posType: item.posType.posTypeName, posLevel: item.posLevel.posLevelName, + posExecutive: item.posExecutive, projectName: item.development.projectName, }));