diff --git a/admin/cadQgrupos.php b/admin/cadQgrupos.php index 1a4c2460..08268f46 100644 --- a/admin/cadQgrupos.php +++ b/admin/cadQgrupos.php @@ -414,7 +414,7 @@
- + | diff --git a/contacteFunc.php b/contacteFunc.php index 24dbc18b..689e64d2 100644 --- a/contacteFunc.php +++ b/contacteFunc.php @@ -346,7 +346,7 @@ function GetDacPadraoAgente($dbcon, $getId = true) if (IsAdmin()) return 0; - $query = "SELECT dac_padrao AS id_dac, b.nome FROM pbx_usuarios a, pbx_dacs b WHERE b.id = a.dac_padrao AND a.id = $idUser b.org_id = $org_id"; + $query = "SELECT dac_padrao AS id_dac, b.nome FROM pbx_usuarios a, pbx_dacs b WHERE b.id = a.dac_padrao AND a.id = $idUser AND b.org_id = $org_id"; //echo $query; $result = pg_query($dbcon, $query); $row = @pg_fetch_row($result); diff --git a/include/util/funcoesApl.php b/include/util/funcoesApl.php index ac71a4c4..53ddd1a1 100755 --- a/include/util/funcoesApl.php +++ b/include/util/funcoesApl.php @@ -1337,7 +1337,7 @@ function GetOrganizacao() { INNER JOIN pbx_organizacao_usuarios pou ON po.id = pou.id_organizacao INNER JOIN pbx_usuarios pu ON pu.id = pou.id_usuario WHERE id_usuario = %s - AND (org_padrao = po.id OR po.id = (SELECT MIN(id_organizacao) FROM pbx_organizacao_usuarios WHERE id_usuario = pu.id AND po.status='1'))"; + AND po.id = (SELECT MIN(id_organizacao) FROM pbx_organizacao_usuarios WHERE id_usuario = pu.id AND po.status='1')"; $query = sprintf($query, $_SESSION['SSidUser']); $result = pg_query($dbcon, $query); $res = pg_fetch_assoc($result); diff --git a/projeto/base/sql/versao-1.9.0.sql b/projeto/base/sql/versao-1.9.0.sql index d9747d29..a5a81a91 100644 --- a/projeto/base/sql/versao-1.9.0.sql +++ b/projeto/base/sql/versao-1.9.0.sql @@ -231,7 +231,7 @@ ALTER TABLE pbx_sip_ramais ADD COLUMN registro varchar(100); ALTER TABLE pbx_queues_grupos - ADD COLUMN numero_asterisk varchar(25) + ADD COLUMN numero_asterisk varchar(25); ALTER TABLE pbx_queues_grupos - ADD COLUMN nome_asterisk varchar(105) + ADD COLUMN nome_asterisk varchar(105);