Merge branch 'develop' into adiDev

2024-03-07 09:33:52 +07:00 · 2024-03-07 09:33:52 +07:00 · ae0d0388b8
commit ae0d0388b8
parent 830de8493b 119bb83e11
1 changed files with 2 additions and 0 deletions
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@ -906,6 +906,7 @@ export class ProfileController extends Controller {
      page: number;
      pageSize: number;
      keyword?: string;
+      rootId?: string;
    },
  ) {
    const findRevision = await this.orgRevisionRepository.findOne({
@ -930,6 +931,7 @@ export class ProfileController extends Controller {
      .leftJoinAndSelect("current_holder.posType", "posType")
      .where({
        orgRevisionId: findRevision?.id,
+        orgRootId: body.rootId == null ? "1=1" : body.rootId,
        current_holderId: Not(IsNull()),
      })
      .andWhere(