diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 006cf6aa..0a2e40a5 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -2758,12 +2758,63 @@ export class OrganizationDotnetController extends Controller {
     @Request() req: RequestWithUser,
     @Body()
     body: {
-      node: string;
+      node: number;
       nodeId: string;
+      isAll: boolean;
     },
   ) {
+    let typeCondition: any = {};
+    if (body.isAll == false) {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+          orgChild1Id: IsNull(),
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+          orgChild2Id: IsNull(),
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+          orgChild3Id: IsNull(),
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+          orgChild4Id: IsNull(),
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    } else {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    }
     const profile = await this.profileRepo.find({
-      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false },
+      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition },
       relations: [
         "current_holders",
         "current_holders.orgRoot",
@@ -2831,12 +2882,63 @@ export class OrganizationDotnetController extends Controller {
     @Request() req: RequestWithUser,
     @Body()
     body: {
-      node: string;
+      node: number;
       nodeId: string;
+      isAll: boolean;
     },
   ) {
+    let typeCondition: any = {};
+    if (body.isAll == false) {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+          orgChild1Id: IsNull(),
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+          orgChild2Id: IsNull(),
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+          orgChild3Id: IsNull(),
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+          orgChild4Id: IsNull(),
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    } else {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    }
     const profile = await this.profileEmpRepo.find({
-      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false },
+      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition },
       relations: [
         "current_holders",
         "current_holders.orgRoot",