diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 8966a0ba..d5a44396 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -704,130 +704,230 @@ export class OrganizationController extends Controller {
           : [];
 
       // const formattedData = orgRootData.map((orgRoot) => {
-      const formattedData = await Promise.all(orgRootData.map(async (orgRoot) => {
-        return {
-          orgTreeId: orgRoot.id,
-          orgLevel: 0,
-          orgName: orgRoot.orgRootName,
-          orgTreeName: orgRoot.orgRootName,
-          orgTreeShortName: orgRoot.orgRootShortName,
-          orgTreeCode: orgRoot.orgRootCode,
-          orgCode: orgRoot.orgRootCode + "00",
-          orgTreeRank: orgRoot.orgRootRank,
-          orgTreeOrder: orgRoot.orgRootOrder,
-          orgTreePhoneEx: orgRoot.orgRootPhoneEx,
-          orgTreePhoneIn: orgRoot.orgRootPhoneIn,
-          orgTreeFax: orgRoot.orgRootFax,
-          orgRevisionId: orgRoot.orgRevisionId,
-          orgRootName: orgRoot.orgRootName,
-          totalPosition: await this.posMasterRepository.count({ where: { orgRootId: orgRoot.id }}),
-          totalPositionCurrentUse: await this.posMasterRepository.count({ where: { orgRootId: orgRoot.id, profileIdCurrentHolder: Not(IsNull()) && Not("") }}),
-          totalPositionCurrentVacant: await this.posMasterRepository.count({ where: { orgRootId: orgRoot.id, profileIdCurrentHolder: IsNull() && "" }}),
-          totalPositionNextUse: await this.posMasterRepository.count({ where: { orgRootId: orgRoot.id, profileIdNextHolder: Not(IsNull()) && Not("") }}),
-          totalPositionNextVacant: await this.posMasterRepository.count({ where: { orgRootId: orgRoot.id, profileIdNextHolder: IsNull() && "" }}),
+      const formattedData = await Promise.all(
+        orgRootData.map(async (orgRoot) => {
+          return {
+            orgTreeId: orgRoot.id,
+            orgLevel: 0,
+            orgName: orgRoot.orgRootName,
+            orgTreeName: orgRoot.orgRootName,
+            orgTreeShortName: orgRoot.orgRootShortName,
+            orgTreeCode: orgRoot.orgRootCode,
+            orgCode: orgRoot.orgRootCode + "00",
+            orgTreeRank: orgRoot.orgRootRank,
+            orgTreeOrder: orgRoot.orgRootOrder,
+            orgTreePhoneEx: orgRoot.orgRootPhoneEx,
+            orgTreePhoneIn: orgRoot.orgRootPhoneIn,
+            orgTreeFax: orgRoot.orgRootFax,
+            orgRevisionId: orgRoot.orgRevisionId,
+            orgRootName: orgRoot.orgRootName,
+            totalPosition: await this.posMasterRepository.count({
+              where: { orgRootId: orgRoot.id },
+            }),
+            totalPositionCurrentUse: await this.posMasterRepository.count({
+              where: { orgRootId: orgRoot.id, profileIdCurrentHolder: Not(IsNull()) && Not("") },
+            }),
+            totalPositionCurrentVacant: await this.posMasterRepository.count({
+              where: { orgRootId: orgRoot.id, profileIdCurrentHolder: IsNull() && "" },
+            }),
+            totalPositionNextUse: await this.posMasterRepository.count({
+              where: { orgRootId: orgRoot.id, profileIdNextHolder: Not(IsNull()) && Not("") },
+            }),
+            totalPositionNextVacant: await this.posMasterRepository.count({
+              where: { orgRootId: orgRoot.id, profileIdNextHolder: IsNull() && "" },
+            }),
 
-          children: orgChild1Data
-            .filter((orgChild1) => orgChild1.orgRootId === orgRoot.id)
-            .map(async (orgChild1) => ({
-              orgTreeId: orgChild1.id,
-              orgRootId: orgRoot.id,
-              orgLevel: 1,
-              orgName: `${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
-              orgTreeName: orgChild1.orgChild1Name,
-              orgTreeShortName: orgChild1.orgChild1ShortName,
-              orgTreeCode: orgChild1.orgChild1Code,
-              orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
-              orgTreeRank: orgChild1.orgChild1Rank,
-              orgTreeOrder: orgChild1.orgChild1Order,
-              orgRootCode: orgRoot.orgRootCode,
-              orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
-              orgTreePhoneIn: orgChild1.orgChild1PhoneIn,
-              orgTreeFax: orgChild1.orgChild1Fax,
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootName: orgRoot.orgRootName,
-              totalPosition: await this.posMasterRepository.count({ where: { orgChild1Id: orgChild1.id }}),
-              totalPositionCurrentUse: await this.posMasterRepository.count({ where: { orgChild1Id: orgChild1.id, profileIdCurrentHolder: Not(IsNull()) && Not("") }}),
-              totalPositionCurrentVacant: await this.posMasterRepository.count({ where: { orgChild1Id: orgChild1.id, profileIdCurrentHolder: IsNull() && "" }}),
-              totalPositionNextUse: await this.posMasterRepository.count({ where: { orgChild1Id: orgChild1.id, profileIdNextHolder: Not(IsNull()) && Not("") }}),
-              totalPositionNextVacant: await this.posMasterRepository.count({ where: { orgChild1Id: orgChild1.id, profileIdNextHolder: IsNull() && "" }}),
-              children: orgChild2Data
-                .filter((orgChild2) => orgChild2.orgChild1Id === orgChild1.id)
-                .map(async (orgChild2) => ({
-                  orgTreeId: orgChild2.id,
-                  orgRootId: orgChild1.id,
-                  orgLevel: 2,
-                  orgName: `${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
-                  orgTreeName: orgChild2.orgChild2Name,
-                  orgTreeShortName: orgChild2.orgChild2ShortName,
-                  orgTreeCode: orgChild2.orgChild2Code,
-                  orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
-                  orgTreeRank: orgChild2.orgChild2Rank,
-                  orgTreeOrder: orgChild2.orgChild2Order,
+            children: await Promise.all(
+              orgChild1Data
+                .filter((orgChild1) => orgChild1.orgRootId === orgRoot.id)
+                .map(async (orgChild1) => ({
+                  orgTreeId: orgChild1.id,
+                  orgRootId: orgRoot.id,
+                  orgLevel: 1,
+                  orgName: `${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
+                  orgTreeName: orgChild1.orgChild1Name,
+                  orgTreeShortName: orgChild1.orgChild1ShortName,
+                  orgTreeCode: orgChild1.orgChild1Code,
+                  orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
+                  orgTreeRank: orgChild1.orgChild1Rank,
+                  orgTreeOrder: orgChild1.orgChild1Order,
                   orgRootCode: orgRoot.orgRootCode,
-                  orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
-                  orgTreePhoneIn: orgChild2.orgChild2PhoneIn,
-                  orgTreeFax: orgChild2.orgChild2Fax,
+                  orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
+                  orgTreePhoneIn: orgChild1.orgChild1PhoneIn,
+                  orgTreeFax: orgChild1.orgChild1Fax,
                   orgRevisionId: orgRoot.orgRevisionId,
                   orgRootName: orgRoot.orgRootName,
-                  totalPosition: await this.posMasterRepository.count({ where: { orgChild2Id: orgChild2.id }}),
-                  totalPositionCurrentUse: await this.posMasterRepository.count({ where: { orgChild2Id: orgChild2.id, profileIdCurrentHolder: Not(IsNull()) && Not("") }}),
-                  totalPositionCurrentVacant: await this.posMasterRepository.count({ where: { orgChild2Id: orgChild2.id, profileIdCurrentHolder: IsNull() && "" }}),
-                  totalPositionNextUse: await this.posMasterRepository.count({ where: { orgChild2Id: orgChild2.id, profileIdNextHolder: Not(IsNull()) && Not("") }}),
-                  totalPositionNextVacant: await this.posMasterRepository.count({ where: { orgChild2Id: orgChild2.id, profileIdNextHolder: IsNull() && "" }}),
-                  children: orgChild3Data
-                    .filter((orgChild3) => orgChild3.orgChild2Id === orgChild2.id)
-                    .map(async (orgChild3) => ({
-                      orgTreeId: orgChild3.id,
-                      orgRootId: orgChild2.id,
-                      orgLevel: 3,
-                      orgName: `${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
-                      orgTreeName: orgChild3.orgChild3Name,
-                      orgTreeShortName: orgChild3.orgChild3ShortName,
-                      orgTreeCode: orgChild3.orgChild3Code,
-                      orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
-                      orgTreeRank: orgChild3.orgChild3Rank,
-                      orgTreeOrder: orgChild3.orgChild3Order,
-                      orgRootCode: orgRoot.orgRootCode,
-                      orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
-                      orgTreePhoneIn: orgChild3.orgChild3PhoneIn,
-                      orgTreeFax: orgChild3.orgChild3Fax,
-                      orgRevisionId: orgRoot.orgRevisionId,
-                      orgRootName: orgRoot.orgRootName,
-                      totalPosition: await this.posMasterRepository.count({ where: { orgChild3Id: orgChild3.id }}),
-                      totalPositionCurrentUse: await this.posMasterRepository.count({ where: { orgChild3Id: orgChild3.id, profileIdCurrentHolder: Not(IsNull()) && Not("") }}),
-                      totalPositionCurrentVacant: await this.posMasterRepository.count({ where: { orgChild3Id: orgChild3.id, profileIdCurrentHolder: IsNull() && "" }}),
-                      totalPositionNextUse: await this.posMasterRepository.count({ where: { orgChild3Id: orgChild3.id, profileIdNextHolder: Not(IsNull()) && Not("") }}),
-                      totalPositionNextVacant: await this.posMasterRepository.count({ where: { orgChild3Id: orgChild3.id, profileIdNextHolder: IsNull() && "" }}),
-                      children: orgChild4Data
-                        .filter((orgChild4) => orgChild4.orgChild3Id === orgChild3.id)
-                        .map(async (orgChild4) => ({
-                          orgTreeId: orgChild4.id,
-                          orgRootId: orgChild3.id,
-                          orgLevel: 4,
-                          orgName: `${orgChild4.orgChild4Name}/${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
-                          orgTreeName: orgChild4.orgChild4Name,
-                          orgTreeShortName: orgChild4.orgChild4ShortName,
-                          orgTreeCode: orgChild4.orgChild4Code,
-                          orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
-                          orgTreeRank: orgChild4.orgChild4Rank,
-                          orgTreeOrder: orgChild4.orgChild4Order,
-                          orgRootCode: orgRoot.orgRootCode,
-                          orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
-                          orgTreePhoneIn: orgChild4.orgChild4PhoneIn,
-                          orgTreeFax: orgChild4.orgChild4Fax,
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootName: orgRoot.orgRootName,
-                          totalPosition: await this.posMasterRepository.count({ where: { orgChild4Id: orgChild4.id }}),
-                          totalPositionCurrentUse: await this.posMasterRepository.count({ where: { orgChild4Id: orgChild4.id, profileIdCurrentHolder: Not(IsNull()) && Not("") }}),
-                          totalPositionCurrentVacant: await this.posMasterRepository.count({ where: { orgChild4Id: orgChild4.id, profileIdCurrentHolder: IsNull() && "" }}),
-                          totalPositionNextUse: await this.posMasterRepository.count({ where: { orgChild4Id: orgChild4.id, profileIdNextHolder: Not(IsNull()) && Not("") }}),
-                          totalPositionNextVacant: await this.posMasterRepository.count({ where: { orgChild4Id: orgChild4.id, profileIdNextHolder: IsNull() && "" }}),
-                        })),
-                    })),
+                  totalPosition: await this.posMasterRepository.count({
+                    where: { orgChild1Id: orgChild1.id },
+                  }),
+                  totalPositionCurrentUse: await this.posMasterRepository.count({
+                    where: {
+                      orgChild1Id: orgChild1.id,
+                      profileIdCurrentHolder: Not(IsNull()) && Not(""),
+                    },
+                  }),
+                  totalPositionCurrentVacant: await this.posMasterRepository.count({
+                    where: { orgChild1Id: orgChild1.id, profileIdCurrentHolder: IsNull() && "" },
+                  }),
+                  totalPositionNextUse: await this.posMasterRepository.count({
+                    where: {
+                      orgChild1Id: orgChild1.id,
+                      profileIdNextHolder: Not(IsNull()) && Not(""),
+                    },
+                  }),
+                  totalPositionNextVacant: await this.posMasterRepository.count({
+                    where: { orgChild1Id: orgChild1.id, profileIdNextHolder: IsNull() && "" },
+                  }),
+                  children: await Promise.all(
+                    orgChild2Data
+                      .filter((orgChild2) => orgChild2.orgChild1Id === orgChild1.id)
+                      .map(async (orgChild2) => ({
+                        orgTreeId: orgChild2.id,
+                        orgRootId: orgChild1.id,
+                        orgLevel: 2,
+                        orgName: `${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
+                        orgTreeName: orgChild2.orgChild2Name,
+                        orgTreeShortName: orgChild2.orgChild2ShortName,
+                        orgTreeCode: orgChild2.orgChild2Code,
+                        orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
+                        orgTreeRank: orgChild2.orgChild2Rank,
+                        orgTreeOrder: orgChild2.orgChild2Order,
+                        orgRootCode: orgRoot.orgRootCode,
+                        orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
+                        orgTreePhoneIn: orgChild2.orgChild2PhoneIn,
+                        orgTreeFax: orgChild2.orgChild2Fax,
+                        orgRevisionId: orgRoot.orgRevisionId,
+                        orgRootName: orgRoot.orgRootName,
+                        totalPosition: await this.posMasterRepository.count({
+                          where: { orgChild2Id: orgChild2.id },
+                        }),
+                        totalPositionCurrentUse: await this.posMasterRepository.count({
+                          where: {
+                            orgChild2Id: orgChild2.id,
+                            profileIdCurrentHolder: Not(IsNull()) && Not(""),
+                          },
+                        }),
+                        totalPositionCurrentVacant: await this.posMasterRepository.count({
+                          where: {
+                            orgChild2Id: orgChild2.id,
+                            profileIdCurrentHolder: IsNull() && "",
+                          },
+                        }),
+                        totalPositionNextUse: await this.posMasterRepository.count({
+                          where: {
+                            orgChild2Id: orgChild2.id,
+                            profileIdNextHolder: Not(IsNull()) && Not(""),
+                          },
+                        }),
+                        totalPositionNextVacant: await this.posMasterRepository.count({
+                          where: { orgChild2Id: orgChild2.id, profileIdNextHolder: IsNull() && "" },
+                        }),
+                        children: await Promise.all(
+                          orgChild3Data
+                            .filter((orgChild3) => orgChild3.orgChild2Id === orgChild2.id)
+                            .map(async (orgChild3) => ({
+                              orgTreeId: orgChild3.id,
+                              orgRootId: orgChild2.id,
+                              orgLevel: 3,
+                              orgName: `${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
+                              orgTreeName: orgChild3.orgChild3Name,
+                              orgTreeShortName: orgChild3.orgChild3ShortName,
+                              orgTreeCode: orgChild3.orgChild3Code,
+                              orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
+                              orgTreeRank: orgChild3.orgChild3Rank,
+                              orgTreeOrder: orgChild3.orgChild3Order,
+                              orgRootCode: orgRoot.orgRootCode,
+                              orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
+                              orgTreePhoneIn: orgChild3.orgChild3PhoneIn,
+                              orgTreeFax: orgChild3.orgChild3Fax,
+                              orgRevisionId: orgRoot.orgRevisionId,
+                              orgRootName: orgRoot.orgRootName,
+                              totalPosition: await this.posMasterRepository.count({
+                                where: { orgChild3Id: orgChild3.id },
+                              }),
+                              totalPositionCurrentUse: await this.posMasterRepository.count({
+                                where: {
+                                  orgChild3Id: orgChild3.id,
+                                  profileIdCurrentHolder: Not(IsNull()) && Not(""),
+                                },
+                              }),
+                              totalPositionCurrentVacant: await this.posMasterRepository.count({
+                                where: {
+                                  orgChild3Id: orgChild3.id,
+                                  profileIdCurrentHolder: IsNull() && "",
+                                },
+                              }),
+                              totalPositionNextUse: await this.posMasterRepository.count({
+                                where: {
+                                  orgChild3Id: orgChild3.id,
+                                  profileIdNextHolder: Not(IsNull()) && Not(""),
+                                },
+                              }),
+                              totalPositionNextVacant: await this.posMasterRepository.count({
+                                where: {
+                                  orgChild3Id: orgChild3.id,
+                                  profileIdNextHolder: IsNull() && "",
+                                },
+                              }),
+                              children: await Promise.all(
+                                orgChild4Data
+                                  .filter((orgChild4) => orgChild4.orgChild3Id === orgChild3.id)
+                                  .map(async (orgChild4) => ({
+                                    orgTreeId: orgChild4.id,
+                                    orgRootId: orgChild3.id,
+                                    orgLevel: 4,
+                                    orgName: `${orgChild4.orgChild4Name}/${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`,
+                                    orgTreeName: orgChild4.orgChild4Name,
+                                    orgTreeShortName: orgChild4.orgChild4ShortName,
+                                    orgTreeCode: orgChild4.orgChild4Code,
+                                    orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
+                                    orgTreeRank: orgChild4.orgChild4Rank,
+                                    orgTreeOrder: orgChild4.orgChild4Order,
+                                    orgRootCode: orgRoot.orgRootCode,
+                                    orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
+                                    orgTreePhoneIn: orgChild4.orgChild4PhoneIn,
+                                    orgTreeFax: orgChild4.orgChild4Fax,
+                                    orgRevisionId: orgRoot.orgRevisionId,
+                                    orgRootName: orgRoot.orgRootName,
+                                    totalPosition: await this.posMasterRepository.count({
+                                      where: { orgChild4Id: orgChild4.id },
+                                    }),
+                                    totalPositionCurrentUse: await this.posMasterRepository.count({
+                                      where: {
+                                        orgChild4Id: orgChild4.id,
+                                        profileIdCurrentHolder: Not(IsNull()) && Not(""),
+                                      },
+                                    }),
+                                    totalPositionCurrentVacant:
+                                      await this.posMasterRepository.count({
+                                        where: {
+                                          orgChild4Id: orgChild4.id,
+                                          profileIdCurrentHolder: IsNull() && "",
+                                        },
+                                      }),
+                                    totalPositionNextUse: await this.posMasterRepository.count({
+                                      where: {
+                                        orgChild4Id: orgChild4.id,
+                                        profileIdNextHolder: Not(IsNull()) && Not(""),
+                                      },
+                                    }),
+                                    totalPositionNextVacant: await this.posMasterRepository.count({
+                                      where: {
+                                        orgChild4Id: orgChild4.id,
+                                        profileIdNextHolder: IsNull() && "",
+                                      },
+                                    }),
+                                  })),
+                              ),
+                            })),
+                        ),
+                      })),
+                  ),
                 })),
-            })),
-        };
-      }));
+            ),
+          };
+        }),
+      );
 
       return new HttpSuccess(formattedData);
     } catch (error) {