obter a penas o nome na tela do supervisor

supervisor.php

@@ -462,10 +462,10 @@ function GetDacsAcesso($idUser, $array = false)
     global $dbcon;
     $org_id = GetOrganizacao();
 
-    $query = "SELECT DISTINCT SUBSTRING(b.nome, 1, position('@' IN b.nome) - 1) AS nome1, b.nome
+    $query = "SELECT DISTINCT b.nome
                 FROM pbx_queues_grupos b
-                INNER JOIN pbx_fila_grupos c ON c.id = b.id
-                INNER JOIN pbx_grupo_usuario d ON d.gp_id = c.gp_id 
+                INNER JOIN pbx_fila_grupos c ON c.id = b.id and c.org_id = b.org_id
+                INNER JOIN pbx_grupo_usuario d ON d.gp_id = c.gp_id and d.org_id = c.org_id
                 AND d.user_id =  %s  and b.status = 'A' ";
     $query = sprintf($query, IsAdmin() ? 'd.user_id' : QuotedStr($idUser));
     $query .= " AND b.org_id = {$org_id}";