From d3ecbf3bd1495057988c0da29dabf319e70d459a Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 4 Apr 2024 11:31:42 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=81=20posType,=20posLev?= =?UTF-8?q?el=20=E0=B8=A1=E0=B8=B5=E0=B8=84=E0=B9=88=E0=B8=B2=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentEmployeeHistoryController.ts | 6 +++--- src/controllers/DevelopmentHistoryController.ts | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index ae36d4e..2b1f386 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(year != 0 || year != null || year != undefined ? "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) => { @@ -276,8 +276,8 @@ export class DevelopmentEmployeeHistoryController extends Controller { citizenId: item.citizenId, fullName: item.prefix+item.firstName+" "+item.lastName, position: item.position, - posType: item.employeePosType.posTypeName, - posLevel: item.employeePosLevel.posLevelName, + posType: item.employeePosType ? item.employeePosType.posTypeName : null, + posLevel: item.employeePosLevel ? item.employeePosLevel.posLevelName : null, projectName: item.development.projectName, })); diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 429b4c2..f00ad71 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 || year != undefined ? "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) => { @@ -266,14 +266,13 @@ export class DevelopmentOfficerHistoryController extends Controller { .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); - const formattedData = development.map(item => ({ id: item.id, citizenId: item.citizenId, fullName: item.prefix+item.firstName+" "+item.lastName, position: item.position, - posType: item.posType.posTypeName, - posLevel: item.posLevel.posLevelName, + posType: item.posType ? item.posType.posTypeName : null, + posLevel: item.posLevel ? item.posLevel.posLevelName : null, posExecutive: item.posExecutive, projectName: item.development.projectName, }));