diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 38e17b06..b3cc030f 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -4506,12 +4506,13 @@ export class OrganizationDotnetController extends Controller { role: string; isRetirement?: boolean; revisionId?: string; + reqNode?: number; + reqNodeId?: string; }, ) { let typeCondition: any = {}; - const node = body.role === "OWNER" ? null : body.node; - if (body.role === "OWNER" || body.role === "CHILD") { - switch (node) { + if (body.role === "CHILD") { + switch (body.node) { case 0: typeCondition = { orgRoot: { @@ -4547,21 +4548,53 @@ export class OrganizationDotnetController extends Controller { } }; break; - case null: + default: typeCondition = {}; break; + } + } else if (body.role === "ROOT" || body.role === "OWNER") { + switch (body.reqNode) { + case 0: + typeCondition = { + orgRoot: { + id: body.reqNodeId + } + }; + break; + case 1: + typeCondition = { + orgChild1: { + id: body.reqNodeId + } + }; + break; + case 2: + typeCondition = { + orgChild2: { + id: body.reqNodeId + } + }; + break; + case 3: + typeCondition = { + orgChild3: { + id: body.reqNodeId + } + }; + break; + case 4: + typeCondition = { + orgChild4: { + id: body.reqNodeId + } + }; + break; default: typeCondition = {}; break; } - } else if (body.role === "ROOT") { - typeCondition = { - orgRoot: { - ancestorDNA: body.nodeId - }, - }; } else if (body.role === "NORMAL") { - switch (node) { + switch (body.node) { case 0: typeCondition = { orgRoot: {