From 2ab006331f7c677ba0c120871ace588afbd7b87f Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 21 Jan 2025 10:57:40 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=A5=E0=B8=B9=E0=B8=81?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileEmployeeController.ts | 7 ++++--- src/controllers/ProfileEmployeeTempController.ts | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 714c34bf..552a5c96 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -3368,11 +3368,12 @@ export class ProfileEmployeeController extends Controller { .where((qb) => { if (body.rootId) { qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId }); + } else { + qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", { + orgRevisionId: findRevision?.id, + }); } qb.andWhere("employeePosMaster.current_holderId IS NOT NULL"); - qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", { - orgRevisionId: findRevision?.id, - }); }) .andWhere( new Brackets((qb) => { diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index bc0e37b9..f4bc3cba 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -2686,11 +2686,12 @@ export class ProfileEmployeeTempController extends Controller { .where((qb) => { if (body.rootId) { qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId }); + } else { + qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", { + orgRevisionId: findRevision?.id, + }); } qb.andWhere("employeePosMaster.current_holderId IS NOT NULL"); - qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", { - orgRevisionId: findRevision?.id, - }); }) .andWhere( new Brackets((qb) => {