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 }), }, }, },