diff --git a/Modules/Agents/Services/AgentService.php b/Modules/Agents/Services/AgentService.php
index 7ae3105..d54477c 100644
--- a/Modules/Agents/Services/AgentService.php
+++ b/Modules/Agents/Services/AgentService.php
@@ -263,6 +263,14 @@ class AgentService
         }
         //execute query get list
         $listAgentGet = $myAgentDown->get();
+
+        $allAgentInGeneral = $this->modelAgentUser->byParentPath($agentId)->joinAgent()->get();
+        $AgentById = [];
+        if(!empty($allAgentInGeneral)){
+            foreach($allAgentInGeneral as $vAgent){
+                $AgentById[$vAgent->agent_id] = $vAgent;
+            }
+        }
         $finalData = [];
         if (!empty($listAgentGet)) {
             $listAgentById = [];
@@ -273,8 +281,8 @@ class AgentService
                 $listAgentById[$kAgent->agent_id] = $kAgent;
             }
             foreach ($listAgentGet as $vAgent) {
-                if (!empty($listAgentById[$vAgent->grant_parent_id])) {
-                    $agentParent = $listAgentById[$vAgent->grant_parent_id];
+                if (!empty($AgentById[$vAgent->grant_parent_id])) {
+                    $agentParent = $AgentById[$vAgent->grant_parent_id];
                     $upGrant = $agentParent->code ?? null;
                 }
                 if (!empty($input['up_grant'])) { // if existing up_geant