From 45c46112cd6591b6f5d79e4eb5b36f77db56eeb8 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Thu, 27 May 2004 00:42:15 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@100 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/FichaDataProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/siprp/FichaDataProvider.java b/trunk/siprp/FichaDataProvider.java index bf6aeb1f..8f219509 100644 --- a/trunk/siprp/FichaDataProvider.java +++ b/trunk/siprp/FichaDataProvider.java @@ -358,7 +358,8 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter { { Select select = new Select( new String[]{ T_ESTABELECIMENTOS }, new String[]{ ID, NOME }, - new Field( EMPRESA_ID ).isEqual( empresaID ), + new Field( EMPRESA_ID ).isEqual( empresaID ).and( + new Field( INACTIVO ).isDifferent( "y" ) ), new String[]{ "lower(" + NOME + ")" }, null ); Virtual2DArray array = executer.executeQuery( select ); IDObject objects[] = new IDObject[ array.columnLength() ]; @@ -396,7 +397,8 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter { { Select select = new Select( new String[]{ T_TRABALHADORES }, new String[]{ ID, NOME }, - new Field( ESTABELECIMENTO_ID ).isEqual( estabelecimentoID ), + new Field( ESTABELECIMENTO_ID ).isEqual( estabelecimentoID ).and( + new Field( INACTIVO ).isDifferent( "y" ) ), new String[]{ "lower(" + NOME + ")" }, null ); Virtual2DArray array = executer.executeQuery( select ); IDObject objects[] = new IDObject[ array.columnLength() ];