From d961ab086bd8092fb60706fd23e41d6bf72d1697 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Tue, 8 Apr 2025 08:48:36 +0700 Subject: [PATCH] fix: not all user return when pass responsibleDistrictArea --- src/controllers/02-user-controller.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controllers/02-user-controller.ts b/src/controllers/02-user-controller.ts index 8f536f1..0a92740 100644 --- a/src/controllers/02-user-controller.ts +++ b/src/controllers/02-user-controller.ts @@ -178,6 +178,7 @@ type UserUpdate = { branchId?: string | string[]; }; +const permissionCondCompany = createPermCondition((_) => true); const permissionCond = createPermCondition(globalAllow); const permissionCheck = createPermCheck(globalAllow); @@ -348,7 +349,9 @@ export class UserController extends Controller { : { some: { branch: { - OR: permissionCond(req.user, { activeOnly: activeBranchOnly }), + OR: responsibleDistrictId + ? permissionCondCompany(req.user, { activeOnly: activeBranchOnly }) // NOTE: when pass responsibleDistrictId should see all user not only to current branch + : permissionCond(req.user, { activeOnly: activeBranchOnly }), }, }, },