From d25d399f76c4b46cbd54909a049fdbfb2c1d7263 Mon Sep 17 00:00:00 2001 From: bruno Date: Mon, 19 Aug 2024 16:08:05 -0400 Subject: [PATCH] Inserir org_id para os pbx_eventos_dacs --- admin/monitorRamal.php | 2 +- .../scripts/manutencaoDB/importaBilhetes.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/monitorRamal.php b/admin/monitorRamal.php index 398754c6..ce156f53 100644 --- a/admin/monitorRamal.php +++ b/admin/monitorRamal.php @@ -154,7 +154,7 @@ function GetRamaisNome($tipoDispositivo) } if (($tipoDispositivo == 2) || ($tipoDispositivo == 3)) { if ($query) { - $query .= "union all\n"; + $query .= "union all \n"; } $query .= "SELECT 'T' as tipo,nome, callerid, tipo as protocol, nome_asterisk as registro FROM pbx_troncos WHERE tipo in('SIP', 'IAX2') AND org_id = $org_id \n"; } diff --git a/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaBilhetes.php b/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaBilhetes.php index 49d73310..0e41d36f 100755 --- a/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaBilhetes.php +++ b/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaBilhetes.php @@ -139,8 +139,8 @@ function ImportaAstEventosDacs($dbcon) /* * Importa a tabela ast_eventos_dacs. */ - $sql = "INSERT INTO pbx_eventos_dacs (id, uid1, uid2, fila, agente, evento, param1, param2, param3, param4) - SELECT id, uid1, uid2, fila, agente, evento, param1, param2, param3, param4 + $sql = "INSERT INTO pbx_eventos_dacs (id, uid1, uid2, fila, agente, evento, param1, param2, param3, param4, org_id) + SELECT id, uid1, uid2, fila, agente, evento, param1, param2, param3, param4, org_id FROM ast_eventos_dacs a WHERE NOT EXISTS(SELECT '' FROM pbx_eventos_dacs WHERE id = a.id)"; if (!$result = pg_query($dbcon, $sql)) { @@ -307,7 +307,7 @@ function CorrigeNumeroDestinoImportados($dbcon) // Criar a tabela temporária precisa_corrigir $createTempTable = "CREATE TEMP TABLE temp_table_precisa_corrigir AS WITH importado_sem_corrigir AS ( - SELECT uniqueid FROM ast_bilhetes ab + SELECT uniqueid, org_id FROM ast_bilhetes ab WHERE corrige_num_destino = 0 AND EXISTS (SELECT '' FROM pbx_bilhetes WHERE id_bilhetes = ab.id_bilhetes) ),