diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts index d4d3f4c3..12fcc815 100644 --- a/src/controllers/PermissionOrgController.ts +++ b/src/controllers/PermissionOrgController.ts @@ -330,11 +330,13 @@ export class PermissionOrgController extends Controller { .leftJoinAndSelect("profileTree.posType", "posType") .leftJoinAndSelect("profileTree.current_holders", "current_holders") .leftJoinAndSelect("current_holders.positions", "positions") + .leftJoinAndSelect("current_holders.orgRevision", "orgRevision") .leftJoinAndSelect("current_holders.orgRoot", "orgRoot") .leftJoinAndSelect("current_holders.orgChild1", "orgChild1") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4") + .where("current_holders.orgRevisionId = :orgRevisionId", {orgRevisionId: findRevision.id}) .andWhere(requestBody.id == null ? "1=1" : `permissionOrg.orgRootId LIKE :rootId`, { rootId: requestBody.id, }) @@ -348,9 +350,9 @@ export class PermissionOrgController extends Controller { keyword: `%${requestBody.searchKeyword}%`, }, ) - .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { - orgRevisionId: findRevision.id, - }) + // .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { + // orgRevisionId: findRevision.id, + // }) .orderBy("current_holders.posMasterNo", "ASC") .skip((requestBody.page - 1) * requestBody.pageSize) .take(requestBody.pageSize) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 4be58540..9744c29e 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -3773,11 +3773,13 @@ export class ProfileController extends Controller { .leftJoinAndSelect("profile.current_holders", "current_holders") .leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("positions.posExecutive", "posExecutive") + .leftJoinAndSelect("current_holders.orgRevision", "orgRevision") .leftJoinAndSelect("current_holders.orgRoot", "orgRoot") .leftJoinAndSelect("current_holders.orgChild1", "orgChild1") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4") + .where("current_holders.orgRevisionId = :orgRevisionId", {orgRevisionId: findRevision.id}) .andWhere( posType != undefined && posType != null && posType != "" ? "posType.posTypeName LIKE :keyword1" @@ -3817,9 +3819,9 @@ export class ProfileController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) - .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { - orgRevisionId: findRevision.id, - }) + // .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { + // orgRevisionId: findRevision.id, + // }) .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) @@ -4130,11 +4132,13 @@ export class ProfileController extends Controller { .leftJoinAndSelect("profile.current_holders", "current_holders") .leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("positions.posExecutive", "posExecutive") + .leftJoinAndSelect("current_holders.orgRevision", "orgRevision") .leftJoinAndSelect("current_holders.orgRoot", "orgRoot") .leftJoinAndSelect("current_holders.orgChild1", "orgChild1") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4") + .where("current_holders.orgRevisionId = :orgRevisionId", {orgRevisionId: findRevision.id}) .andWhere( _data.root != undefined && _data.root != null ? _data.root[0] != null @@ -4224,9 +4228,9 @@ export class ProfileController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) - .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { - orgRevisionId: findRevision.id, - }) + // .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { + // orgRevisionId: findRevision.id, + // }) .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 831cef09..6bb0e0d6 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -1433,11 +1433,13 @@ export class ProfileEmployeeController extends Controller { .leftJoinAndSelect("profileEmployee.current_holders", "current_holders") .leftJoinAndSelect("profileEmployee.profileEmployeeEmployment", "profileEmployeeEmployment") .leftJoinAndSelect("current_holders.positions", "positions") + .leftJoinAndSelect("current_holders.orgRevision", "orgRevision") .leftJoinAndSelect("current_holders.orgRoot", "orgRoot") .leftJoinAndSelect("current_holders.orgChild1", "orgChild1") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4") + .where("current_holders.orgRevisionId = :orgRevisionId", {orgRevisionId: findRevision.id}) .andWhere( _data.root != undefined && _data.root != null ? _data.root[0] != null @@ -1530,9 +1532,9 @@ export class ProfileEmployeeController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) - .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { - orgRevisionId: findRevision.id, - }) + // .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, { + // orgRevisionId: findRevision.id, + // }) .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize)