relatorio callcenter totalizadas por DDD

relatorios/callcenter/geral/recebidasDDD.php

@@ -145,16 +145,17 @@
                             CASE WHEN(tplg_codigo IN(23,24,33,34))THEN 'MÓVEL' ELSE c.nome_municipio END AS nome_municipio,
                             tplg_descricao,count(*) AS qtde, SUM(a.billsec) AS duracao
                         FROM pbx_bilhetes a 
-                        INNER JOIN pbx_eventos_dacs b ON a.uniqueid = b.uid2 AND b.evento IN('COMPLETEAGENT','COMPLETECALLER','COMPLETAAGENT','COMPLETECALLERRAMAL','COMPLETEAGENTRAMAL')
+                        INNER JOIN pbx_eventos_dacs b ON a.uniqueid = b.uid2 AND b.evento IN('COMPLETEAGENT','COMPLETECALLER','COMPLETAAGENT','COMPLETECALLERRAMAL','COMPLETEAGENTRAMAL') AND a.org_id = b.org_id
                         INNER JOIN pbx_municipios c ON a.id_municipio = c.id
                         INNER JOIN pbx_tipo_ligacao d ON a.tipo_chamada = d.tplg_codigo
-                        INNER JOIN pbx_dacs e ON e.nome = b.fila
-                        WHERE a.data_bilhete >= '%s' 
+                        INNER JOIN pbx_dacs e ON e.nome = b.fila AND e.org_id = a.org_id
+                        WHERE a.data_bilhete >= '%s'
                         AND a.data_bilhete <= '%s'
                         AND e.id = %s
                         AND a.lastapp <> 'Transferred Call'
+                        AND a.org_id = %d
                         GROUP BY 1,2,3,4,5
-                        ORDER BY c.uf", $dataIni, $dataFim, $dac);
+                        ORDER BY c.uf", $dataIni, $dataFim, $dac, $this->GetOrgId());
 
             $result = $this->___GetQuery($query);
             $row = pg_fetch_all($result);

relatorios/callcenter/geral/relDesligamento.php

@@ -107,7 +107,7 @@
                             CASE WHEN(b.evento IN('COMPLETEAGENT', 'COMPLETECALLER', 'TRANSFER'))THEN 'F' ELSE 'R' END AS tipo_ligacao
                         FROM pbx_bilhetes a
                         INNER JOIN pbx_eventos_dacs b ON b.uid2 = a.uniqueid AND b.org_id = a.org_id
-                        INNER JOIN pbx_dacs c ON c.nome = b.fila AND c.org_id = b.org_id
+                        INNER JOIN pbx_dacs c ON c.nome = b.fila AND c.org_id = a.org_id
                         INNER JOIN pbx_usuarios d ON d.matricula = substring(b.agente, 7, 4)
                         AND calldate::date >= '%s'
                         AND calldate::date <= '%s'