From 86b84356a2fccef1bf15a122a2d449900e300129 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 6 Mar 2024 18:28:22 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?= =?UTF-8?q?=E0=B8=B2=E0=B8=AA=E0=B8=B1=E0=B8=87=E0=B8=81=E0=B8=B1=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 3e44e046..5f608dce 100644 --- 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, + rootId: body.rootId == null ? "1=1" : body.rootId, current_holderId: Not(IsNull()), }) .andWhere( From 119bb83e11d22fc87f68c972194a50480a9b391a Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 6 Mar 2024 19:07:06 +0700 Subject: [PATCH 2/2] no message --- src/controllers/ProfileController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 5f608dce..ca848909 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -931,7 +931,7 @@ export class ProfileController extends Controller { .leftJoinAndSelect("current_holder.posType", "posType") .where({ orgRevisionId: findRevision?.id, - rootId: body.rootId == null ? "1=1" : body.rootId, + orgRootId: body.rootId == null ? "1=1" : body.rootId, current_holderId: Not(IsNull()), }) .andWhere(