diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 88cff766..84d88bbc 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -105,7 +105,7 @@ export class OrganizationDotnetController extends Controller { condition = "orgRoot.ancestorDNA = :nodeId"; conditionParams = { nodeId: body.nodeId }; } else if (body.role === "PARENT") { - condition = "orgChild1.ancestorDNA = :nodeId"; + condition = "orgRoot.ancestorDNA = :nodeId AND current_holders.orgChild1 IS NOT NULL"; conditionParams = { nodeId: body.nodeId }; } else if (body.role === "NORMAL") { switch (body.node) { @@ -224,7 +224,7 @@ export class OrganizationDotnetController extends Controller { condition = "orgRoot.ancestorDNA = :nodeId"; conditionParams = { nodeId: body.nodeId }; } else if (body.role === "PARENT") { - condition = "orgChild1.ancestorDNA = :nodeId"; + condition = "orgRoot.ancestorDNA = :nodeId AND current_holders.orgChild1 IS NOT NULL"; conditionParams = { nodeId: body.nodeId }; } else if (body.role === "NORMAL") { switch (body.node) { diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts index 54dea336..46f37a73 100644 --- a/src/controllers/PermissionController.ts +++ b/src/controllers/PermissionController.ts @@ -735,7 +735,7 @@ export class PermissionController extends Controller { } else if (privilege == "PARENT") { data = { root: [x.orgRootId], - child1: [x.orgChild1Id], + child1: null, child2: null, child3: null, child4: null, diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index 1fb12f00..1819b647 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -97,7 +97,7 @@ class CheckAuth { } else if (privilege == "PARENT") { data = { root: [x.orgRootId], - child1: [x.orgChild1Id], + child1: null, child2: null, child3: null, child4: null,