Claudio
/
pabx-pesquisa
forked from SimplesIP/pabx-pesquisa
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://192.168.115.233:3000/Claudio/pabx-pesquisa into dev 

Conflicts:
	www/html/aplicativo/cadastros/pesquisa/pesquisaFuncoes.php
dev
root 5 months ago
parent
757fd9f547 d02ce3ce0f
commit
ca765719ad
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      www/html/aplicativo/cadastros/pesquisa/pesquisaFuncoes.php

2
www/html/aplicativo/cadastros/pesquisa/pesquisaFuncoes.php
Unescape View File

@ -12,7 +12,7 @@ function GetPesquisaRel($db, $plId, $matricula = null)
$query = "SELECT a.pl_id, pl_descricao, pl_data_inicio, pl_data_fim, b.pp_id, b.pp_nome $query = "SELECT a.pl_id, pl_descricao, pl_data_inicio, pl_data_fim, b.pp_id, b.pp_nome
FROM pbx_pesquisa_liberacao a FROM pbx_pesquisa_liberacao a
INNER JOIN pbx_pesquisa b ON a.pp_id = b.pp_id INNER JOIN pbx_pesquisa b ON a.pp_id = b.pp_id
ORDER BY a.data_reg DESC"; --ORDER BY a.data_reg DESC";
//query antiga //query antiga
/* $query = sprintf("SELECT DISTINCT a.pl_id, pl_descricao, pl_data_inicio, pl_data_fim, b.pp_id, b.pp_nome /* $query = sprintf("SELECT DISTINCT a.pl_id, pl_descricao, pl_data_inicio, pl_data_fim, b.pp_id, b.pp_nome
FROM pbx_pesquisa_liberacao a FROM pbx_pesquisa_liberacao a

Write Preview
Loading…
Cancel
Save