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) => {