From 13ed3450ddfbad17a52bf2d095aecf364d157ef1 Mon Sep 17 00:00:00 2001 From: Adisak Date: Fri, 7 Nov 2025 13:57:03 +0700 Subject: [PATCH] #208 and update migration --- src/controllers/ProfileController.ts | 12 +++++++----- src/entities/view/viewDirector.ts | 2 ++ ...1-update_viewDirectior_and_viewDirectiorActing.ts | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 7a114b6e..e907d801 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -2886,8 +2886,8 @@ export class ProfileController extends Controller { } else if ((posMaster?.current_holder?.posLevel?.posLevelAuthority ?? null) == "GOVERNOR") { return new HttpSuccess({ data: [], total: 0 }); } - console.log(posMaster); - console.log(posMaster.id); + // console.log(posMaster); + // console.log(posMaster.id); let condition: any = { orgRootId: posMaster.orgRootId, id: Not(posMaster.current_holderId || ""), @@ -2917,9 +2917,9 @@ export class ProfileController extends Controller { condition.isDirector = true; conditionNow.isDirector = true; } - console.log(condition); - console.log("------------------"); - console.log(conditionNow); + // console.log(condition); + // console.log("------------------"); + // console.log(conditionNow); if (body.isAct == true) { const [lists, total] = await AppDataSource.getRepository(viewDirectorActing) .createQueryBuilder("viewDirectorActing") @@ -2928,6 +2928,7 @@ export class ProfileController extends Controller { qb.orWhere(condition).orWhere(conditionNow); }), ) + .andWhere("viewDirectorActing.isProbation = :isProbation", { isProbation: false }) .andWhere( new Brackets((qb) => { qb.orWhere( @@ -2992,6 +2993,7 @@ export class ProfileController extends Controller { qb.orWhere(condition).orWhere(conditionNow); }), ) + .andWhere("viewDirectorActing.isProbation = :isProbation", { isProbation: false }) .andWhere( new Brackets((qb) => { qb.orWhere( diff --git a/src/entities/view/viewDirector.ts b/src/entities/view/viewDirector.ts index d2ed5b65..717265e2 100644 --- a/src/entities/view/viewDirector.ts +++ b/src/entities/view/viewDirector.ts @@ -8,6 +8,8 @@ import { ViewColumn, ViewEntity } from "typeorm"; profile.lastName AS lastName, profile.citizenId AS citizenId, profile.position AS position, + profile.keycloak AS keycloakId, + profile.isProbation AS isProbation, CONCAT( CASE WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName diff --git a/src/migration/1762489522691-update_viewDirectior_and_viewDirectiorActing.ts b/src/migration/1762489522691-update_viewDirectior_and_viewDirectiorActing.ts index 26c26b8f..f3db9b44 100644 --- a/src/migration/1762489522691-update_viewDirectior_and_viewDirectiorActing.ts +++ b/src/migration/1762489522691-update_viewDirectior_and_viewDirectiorActing.ts @@ -73,6 +73,8 @@ export class UpdateViewDirectiorAndViewDirectiorActing1762489522691 implements M profile.lastName AS lastName, profile.citizenId AS citizenId, profile.position AS position, + profile.keycloak AS keycloakId, + profile.isProbation AS isProbation, CONCAT( CASE WHEN posMaster.orgChild1Id IS NULL THEN orgRoot.orgRootShortName