git-svn-id: https://svn.coded.pt/svn/SIPRP@1787 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/siprpWeb/dependenciesCache/dependencies.txt

@@ -1,116 +1,78 @@
-||:com.evolute.siprp.pagina.SiprpWebContextListener
-com.evolute.siprp.pagina.SiprpWebContextListener
-java.lang.StringBuilder
-com.evolute.siprp.pagina.SiprpWebLoggerInitializer
-javax.servlet.ServletContextListener
-java.lang.System
-java.io.PrintStream
-java.text.SimpleDateFormat
-java.lang.Object
-com.evolute.utils.date.DateUtils
-java.util.Date
-java.lang.Exception
-||:com.evolute.siprp.pagina.RelatorioServlet
-javax.servlet.http.HttpSession
-com.evolute.siprp.pagina.RelatorioServlet
-org.apache.velocity.app.Velocity
-com.evolute.utils.error.ErrorLogger
-javax.servlet.http.HttpServletRequest
-javax.servlet.ServletOutputStream
-java.util.Hashtable
-java.io.StringWriter
-java.io.IOException
-java.util.Enumeration
-org.apache.velocity.VelocityContext
-java.lang.String
-com.evolute.siprp.pagina.MailerServlet
-javax.servlet.http.HttpServletResponse
-java.lang.Exception
-||:com.evolute.siprp.pagina.SiprpWebLoggerInitializer
-com.evolute.utils.error.LoggerProperties
-com.evolute.siprp.pagina.SiprpWebLoggerInitializer
-com.evolute.utils.error.ErrorLogger
-java.util.HashMap
-com.evolute.utils.error.ws.WSLogger
-com.evolute.utils.network.proxy.EvoProxyObject
-java.lang.Object
-com.evolute.utils.error.ProjectsEnum
-java.lang.Exception
-||:com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
+||:com.evolute.siprp.pagina.doGetListaEstabelecimentos
 java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
+com.evolute.siprp.pagina.doGetListaEstabelecimentos
 java.sql.DriverManager
 java.util.LinkedList
 javax.servlet.http.HttpServletResponse
 com.evolute.utils.arrays.ResultSet2DArray
 java.lang.Class
 java.util.List
-java.util.Date
-com.evolute.utils.arrays.Virtual2DArray
 java.util.Map
 java.sql.Statement
-com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
+com.evolute.siprp.pagina.SiprpWebLogger
+java.io.IOException
 javax.servlet.ServletOutputStream
-com.evolute.siprp.pagina.GlobalConstants
+java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
 java.util.HashMap
 java.lang.Exception
 javax.servlet.http.HttpSession
-java.lang.Integer
 com.evolute.siprp.pagina.siprpServlet
 java.sql.Connection
 java.lang.String
-||:com.evolute.siprp.pagina.doGetListaEmpresas
-java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
+||:com.evolute.siprp.pagina.RecruitServlet
+org.apache.commons.fileupload.FileItem
 java.lang.StringBuilder
-java.sql.DriverManager
-java.util.LinkedList
+java.lang.System
 javax.servlet.http.HttpServletResponse
-com.evolute.utils.arrays.ResultSet2DArray
-java.lang.Class
+com.evolute.siprp.pagina.RecruitServlet
 java.util.List
-java.util.Map
-java.sql.Statement
-java.lang.IllegalStateException
+java.io.PrintStream
+com.evolute.siprp.pagina.MailerServlet
+java.util.Hashtable
 java.io.IOException
+[B
+java.util.Iterator
 javax.servlet.ServletOutputStream
-java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
-java.util.HashMap
-java.lang.Exception
-com.evolute.siprp.pagina.doGetListaEmpresas
-javax.servlet.http.HttpSession
-com.evolute.siprp.pagina.siprpServlet
-java.sql.Connection
+org.apache.commons.fileupload.FileUploadException
+org.apache.commons.fileupload.FileUpload
+org.apache.commons.fileupload.DiskFileUpload
 java.lang.String
-||:com.evolute.siprp.pagina.doPostLogin
+||:com.evolute.siprp.pagina.doGetTrabalhador
 java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
-com.evolute.siprp.pagina.doGetListaEstabelecimentos
-java.lang.System
 java.sql.DriverManager
+java.io.Serializable
 javax.servlet.http.HttpServletResponse
 com.evolute.utils.arrays.ResultSet2DArray
 java.lang.Class
-java.io.PrintStream
+com.evolute.siprp.pagina.doGetTrabalhador
+java.util.Date
 java.util.Map
 java.sql.Statement
-java.lang.IllegalStateException
+com.evolute.siprp.pagina.SiprpWebLogger
 java.io.IOException
 javax.servlet.ServletOutputStream
 java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
 java.util.HashMap
 java.lang.Exception
-com.evolute.siprp.pagina.doGetListaEmpresas
 javax.servlet.http.HttpSession
-com.evolute.siprp.pagina.doPostLogin
+java.lang.Integer
 com.evolute.siprp.pagina.siprpServlet
 java.sql.Connection
 java.lang.String
+||:com.evolute.siprp.pagina.RequestServlet
+java.lang.String
+com.evolute.siprp.pagina.MailerServlet
+java.util.Hashtable
+com.evolute.siprp.pagina.RequestServlet
+javax.servlet.http.HttpServletRequest
+javax.servlet.http.HttpServletResponse
+java.io.IOException
+javax.servlet.ServletOutputStream
 ||:com.evolute.siprp.pagina.doGetListaTrabalhadoresPendentes
 com.evolute.utils.sql.Select
 java.lang.StringBuilder
@@ -131,214 +93,249 @@ java.lang.Integer
 com.evolute.utils.db.Executer
 com.evolute.siprp.pagina.siprpServlet
 java.lang.String
-||:com.evolute.siprp.pagina.siprpServlet
-java.util.Set
-java.lang.Class
-javax.servlet.ServletOutputStream
-java.util.Vector
-java.util.Map
-java.io.IOException
-java.lang.String
-java.lang.Exception
-java.sql.Statement
+||:com.evolute.siprp.pagina.MailerServlet
+javax.mail.Session
+java.lang.StringBuilder
+java.lang.System
 org.apache.velocity.VelocityContext
+java.sql.DriverManager
 com.evolute.utils.arrays.ResultSet2DArray
-javax.servlet.http.HttpServletRequest
-com.evolute.utils.sql.Select
-com.evolute.utils.db.DBManager
-java.util.StringTokenizer
+java.lang.Class
+java.util.Date
+javax.activation.DataHandler
+javax.mail.Transport
+javax.mail.BodyPart
+java.sql.Statement
+com.evolute.siprp.pagina.MailerServlet
+com.evolute.siprp.pagina.SiprpWebLogger
+javax.mail.Message$RecipientType
+java.util.Hashtable
 javax.servlet.ServletContext
-java.lang.NumberFormatException
-javax.servlet.http.HttpServletResponse
-java.lang.Integer
-com.evolute.siprp.pagina.doGetListaEmpresas
-java.lang.StringBuilder
-java.util.Iterator
-com.evolute.utils.arrays.Virtual2DArray
-com.evolute.utils.db.JDBCManager
-com.evolute.utils.db.Executer
-javax.servlet.http.HttpSession
-java.sql.Connection
-java.lang.IllegalStateException
-com.evolute.siprp.pagina.siprpServlet
-com.evolute.siprp.pagina.doGetListaTrabalhadores
-com.evolute.siprp.pagina.doPostLogin
-com.evolute.siprp.pagina.GlobalConstants
+javax.mail.internet.MimeMessage
 [Ljava.lang.String;
-com.evolute.siprp.pagina.doGetTrabalhador
-java.lang.System
-com.evolute.siprp.pagina.doGetListaEstabelecimentos
-java.io.StringWriter
-java.io.PrintStream
-java.lang.StringBuffer
+com.evolute.siprp.pagina.GlobalConstants
+java.util.Properties
+javax.mail.Multipart
 org.apache.velocity.app.Velocity
+javax.mail.internet.MimeBodyPart
 javax.servlet.http.HttpServlet
+java.lang.Exception
+java.util.Enumeration
+javax.mail.internet.InternetAddress
+javax.mail.internet.MimeMultipart
+org.apache.commons.mail.ByteArrayDataSource
+java.io.StringWriter
+java.lang.String
+java.sql.Connection
+javax.mail.Message
+||:com.evolute.siprp.pagina.SiprpWebLogger
+com.evolute.utils.error.LoggerProperties
 com.evolute.utils.error.ErrorLogger
-java.util.Properties
-||:com.evolute.siprp.pagina.GlobalConstants
+java.io.PrintStream
+java.lang.System
+java.util.HashMap
+java.util.Map
+java.lang.Throwable
+com.evolute.utils.network.proxy.EvoProxyObject
+com.evolute.utils.error.ws.WSLogger
 java.lang.Object
-com.evolute.siprp.pagina.GlobalConstants
-||:com.evolute.siprp.pagina.RecruitServlet
-org.apache.commons.fileupload.FileItem
+com.evolute.utils.error.ProjectsEnum
+com.evolute.siprp.pagina.SiprpWebLogger
+java.lang.Exception
+||:com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
+java.sql.SQLException
 java.lang.StringBuilder
-java.lang.System
+java.sql.DriverManager
+java.util.LinkedList
 javax.servlet.http.HttpServletResponse
-com.evolute.siprp.pagina.RecruitServlet
+com.evolute.utils.arrays.ResultSet2DArray
+java.lang.Class
 java.util.List
-java.io.PrintStream
-com.evolute.siprp.pagina.MailerServlet
-java.util.Hashtable
-java.io.IOException
-[B
-java.util.Iterator
+java.util.Date
+com.evolute.utils.arrays.Virtual2DArray
+java.util.Map
+java.sql.Statement
+com.evolute.siprp.pagina.SiprpWebLogger
+com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
 javax.servlet.ServletOutputStream
+com.evolute.siprp.pagina.GlobalConstants
 javax.servlet.http.HttpServletRequest
-org.apache.commons.fileupload.FileUploadException
-org.apache.commons.fileupload.FileUpload
-org.apache.commons.fileupload.DiskFileUpload
+java.util.HashMap
+java.lang.Exception
+javax.servlet.http.HttpSession
+java.lang.Integer
+com.evolute.siprp.pagina.siprpServlet
+java.sql.Connection
 java.lang.String
+||:com.evolute.siprp.pagina.GlobalConstants
+java.lang.Object
+com.evolute.siprp.pagina.GlobalConstants
 ||:com.evolute.siprp.pagina.ScheduleServlet
 javax.servlet.http.HttpSession
 java.lang.StringBuilder
 org.apache.velocity.app.Velocity
-com.evolute.utils.error.ErrorLogger
 javax.servlet.http.HttpServletRequest
 javax.servlet.ServletOutputStream
 com.evolute.siprp.pagina.ScheduleServlet
-java.io.StringWriter
 java.util.Hashtable
+java.io.StringWriter
 [Ljava.lang.String;
 java.io.IOException
 java.util.Enumeration
 org.apache.velocity.VelocityContext
+com.evolute.siprp.pagina.SiprpWebLogger
 java.lang.String
 com.evolute.siprp.pagina.MailerServlet
 java.lang.Exception
 javax.servlet.http.HttpServletResponse
-||:com.evolute.siprp.pagina.doGetTrabalhador
+||:com.evolute.siprp.pagina.SiprpWebContextListener
+com.evolute.siprp.pagina.SiprpWebContextListener
+java.lang.StringBuilder
+javax.servlet.ServletContextListener
+java.lang.System
+java.io.PrintStream
+java.text.SimpleDateFormat
+java.lang.Object
+com.evolute.siprp.pagina.SiprpWebLogger
+com.evolute.utils.date.DateUtils
+java.util.Date
+java.lang.Exception
+||:com.evolute.siprp.pagina.doGetListaEmpresas
 java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
 java.sql.DriverManager
-java.io.Serializable
+java.util.LinkedList
 javax.servlet.http.HttpServletResponse
 com.evolute.utils.arrays.ResultSet2DArray
 java.lang.Class
-com.evolute.siprp.pagina.doGetTrabalhador
-java.util.Date
+java.util.List
 java.util.Map
 java.sql.Statement
+com.evolute.siprp.pagina.SiprpWebLogger
+java.lang.IllegalStateException
 java.io.IOException
 javax.servlet.ServletOutputStream
 java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
 java.util.HashMap
 java.lang.Exception
+com.evolute.siprp.pagina.doGetListaEmpresas
 javax.servlet.http.HttpSession
-java.lang.Integer
 com.evolute.siprp.pagina.siprpServlet
 java.sql.Connection
 java.lang.String
-||:com.evolute.siprp.pagina.RequestServlet
-java.lang.String
-com.evolute.siprp.pagina.MailerServlet
-java.util.Hashtable
-com.evolute.siprp.pagina.RequestServlet
-javax.servlet.http.HttpServletRequest
-javax.servlet.http.HttpServletResponse
-java.io.IOException
-javax.servlet.ServletOutputStream
-||:com.evolute.siprp.pagina.doGetListaEstabelecimentos
+||:com.evolute.siprp.pagina.doGetListaTrabalhadores
 java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
-com.evolute.siprp.pagina.doGetListaEstabelecimentos
+java.lang.System
 java.sql.DriverManager
+java.io.Serializable
 java.util.LinkedList
 javax.servlet.http.HttpServletResponse
 com.evolute.utils.arrays.ResultSet2DArray
 java.lang.Class
 java.util.List
+java.util.Date
+java.io.PrintStream
+com.evolute.siprp.pagina.doGetListaTrabalhadoresPendentes
 java.util.Map
 java.sql.Statement
-java.io.IOException
+com.evolute.siprp.pagina.SiprpWebLogger
+com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
 javax.servlet.ServletOutputStream
 java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
 java.util.HashMap
 java.lang.Exception
 javax.servlet.http.HttpSession
+java.lang.Integer
+com.evolute.siprp.pagina.doGetListaTrabalhadores
 com.evolute.siprp.pagina.siprpServlet
 java.sql.Connection
 java.lang.String
-||:com.evolute.siprp.pagina.doGetListaTrabalhadores
+||:com.evolute.siprp.pagina.doPostLogin
 java.sql.SQLException
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
+com.evolute.siprp.pagina.doGetListaEstabelecimentos
 java.lang.System
 java.sql.DriverManager
-java.io.Serializable
-java.util.LinkedList
 javax.servlet.http.HttpServletResponse
 com.evolute.utils.arrays.ResultSet2DArray
 java.lang.Class
-java.util.List
-java.util.Date
 java.io.PrintStream
-com.evolute.siprp.pagina.doGetListaTrabalhadoresPendentes
 java.util.Map
 java.sql.Statement
-com.evolute.siprp.pagina.doGetListaTrabalhadoresTudo
+com.evolute.siprp.pagina.SiprpWebLogger
+java.lang.IllegalStateException
+java.io.IOException
 javax.servlet.ServletOutputStream
 java.lang.StringBuffer
 javax.servlet.http.HttpServletRequest
 java.util.HashMap
 java.lang.Exception
+com.evolute.siprp.pagina.doGetListaEmpresas
 javax.servlet.http.HttpSession
-java.lang.Integer
-com.evolute.siprp.pagina.doGetListaTrabalhadores
+com.evolute.siprp.pagina.doPostLogin
 com.evolute.siprp.pagina.siprpServlet
 java.sql.Connection
 java.lang.String
-||:com.evolute.siprp.pagina.MailerServlet
-javax.mail.Session
+||:com.evolute.siprp.pagina.SiprpWebLoggerInitializer
+com.evolute.utils.error.LoggerProperties
+com.evolute.siprp.pagina.SiprpWebLoggerInitializer
 com.evolute.utils.error.ErrorLogger
-java.lang.StringBuilder
-java.lang.System
-org.apache.velocity.VelocityContext
-java.sql.DriverManager
-com.evolute.utils.arrays.ResultSet2DArray
+java.util.HashMap
+com.evolute.utils.error.ws.WSLogger
+com.evolute.utils.network.proxy.EvoProxyObject
+java.lang.Object
+com.evolute.utils.error.ProjectsEnum
+java.lang.Exception
+||:com.evolute.siprp.pagina.siprpServlet
+java.util.Set
 java.lang.Class
-java.util.Date
-javax.activation.DataHandler
-javax.mail.Transport
-javax.mail.BodyPart
+javax.servlet.ServletOutputStream
+java.util.Vector
+java.util.Map
+java.io.IOException
+java.lang.String
+java.lang.Exception
 java.sql.Statement
-com.evolute.siprp.pagina.MailerServlet
-javax.mail.Message$RecipientType
-java.util.Hashtable
+org.apache.velocity.VelocityContext
+com.evolute.utils.arrays.ResultSet2DArray
+javax.servlet.http.HttpServletRequest
+com.evolute.utils.sql.Select
+com.evolute.utils.db.DBManager
+java.util.StringTokenizer
 javax.servlet.ServletContext
-javax.mail.internet.MimeMessage
-[Ljava.lang.String;
+java.lang.NumberFormatException
+javax.servlet.http.HttpServletResponse
+java.lang.Integer
+com.evolute.siprp.pagina.doGetListaEmpresas
+java.lang.StringBuilder
+java.util.Iterator
+com.evolute.siprp.pagina.SiprpWebLogger
+com.evolute.utils.arrays.Virtual2DArray
+com.evolute.utils.db.JDBCManager
+com.evolute.utils.db.Executer
+javax.servlet.http.HttpSession
+java.sql.Connection
+java.lang.IllegalStateException
+com.evolute.siprp.pagina.siprpServlet
+com.evolute.siprp.pagina.doGetListaTrabalhadores
+com.evolute.siprp.pagina.doPostLogin
 com.evolute.siprp.pagina.GlobalConstants
-java.util.Properties
-javax.mail.Multipart
+[Ljava.lang.String;
+com.evolute.siprp.pagina.doGetTrabalhador
+java.lang.System
+com.evolute.siprp.pagina.doGetListaEstabelecimentos
+java.io.StringWriter
+java.io.PrintStream
+java.lang.StringBuffer
 org.apache.velocity.app.Velocity
-javax.mail.internet.MimeBodyPart
 javax.servlet.http.HttpServlet
-java.lang.Exception
-java.util.Enumeration
-javax.mail.internet.InternetAddress
-javax.mail.internet.MimeMultipart
-org.apache.commons.mail.ByteArrayDataSource
-java.io.StringWriter
-java.lang.String
-java.sql.Connection
-javax.mail.Message
+java.util.Properties
 ||:com.evolute.siprp.pagina.NewsServlet
 com.evolute.utils.sql.Select
 com.evolute.utils.db.SQLExecuter
-com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
 org.apache.velocity.VelocityContext
 javax.servlet.http.HttpServletResponse
@@ -346,6 +343,7 @@ com.evolute.utils.strings.StringConverter
 com.evolute.utils.arrays.Virtual2DArray
 com.evolute.utils.sql.Field
 java.util.Map
+com.evolute.siprp.pagina.SiprpWebLogger
 javax.servlet.ServletContext
 java.io.IOException
 java.util.Iterator
@@ -365,3 +363,19 @@ java.lang.String
 com.evolute.siprp.pagina.NewsServlet
 com.evolute.utils.db.DBManager
 java.util.Set
+||:com.evolute.siprp.pagina.RelatorioServlet
+javax.servlet.http.HttpSession
+com.evolute.siprp.pagina.RelatorioServlet
+org.apache.velocity.app.Velocity
+javax.servlet.http.HttpServletRequest
+javax.servlet.ServletOutputStream
+java.util.Hashtable
+java.io.StringWriter
+java.io.IOException
+java.util.Enumeration
+org.apache.velocity.VelocityContext
+com.evolute.siprp.pagina.SiprpWebLogger
+java.lang.String
+com.evolute.siprp.pagina.MailerServlet
+javax.servlet.http.HttpServletResponse
+java.lang.Exception

trunk/siprpWeb/src/com/evolute/siprp/pagina/GlobalConstants.java

@@ -13,6 +13,23 @@ package com.evolute.siprp.pagina;
  */
 public interface GlobalConstants
 {
+//	 // BD
+//    public static final String bdHost = "localhost";
+////	public static final String bdHost = "127.0.0.1";
+//    public static final String bdPort = "5432";
+//    public static final String bdUsername = "postgres";
+//    public static final String bdPassword = "";
+//    public static final String bdDriver = "org.postgresql.Driver";
+//    public static final String bdUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp";
+//	
+//	public static final String bdLocalHost = "localhost";
+////	public static final String bdLocalHost = "127.0.0.1";
+//    public static final String bdLocalPort = "5432";
+//    public static final String bdLocalUsername = "postgres";
+//    public static final String bdLocalPassword = "";
+//    public static final String bdLocalDriver = "org.postgresql.Driver";
+//    public static final String bdLocalUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp_local_3";
+	
 	 // BD
     public static final String bdHost = "www.evolute.pt";
 //	public static final String bdHost = "127.0.0.1";

trunk/siprpWeb/src/com/evolute/siprp/pagina/doGetListaEstabelecimentos.java

@@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import com.evolute.utils.arrays.ResultSet2DArray;
-import com.evolute.utils.error.ErrorLogger;
 
 public class doGetListaEstabelecimentos extends siprpServlet
 
@@ -31,7 +30,7 @@ public class doGetListaEstabelecimentos extends siprpServlet
 		Statement stmt = null;
 		ResultSet2DArray rs;
 		StringBuffer dbQuery, sBuffer;
-		String userRole, empresaId, temp;
+		String userRole, empresaId, temp, username;
 		HttpSession session = req.getSession( false );
 		List< String > links = new LinkedList< String >();
 		List< String > desc = new LinkedList< String >();
@@ -39,6 +38,7 @@ public class doGetListaEstabelecimentos extends siprpServlet
 		{
 			userRole = ( String ) session.getAttribute( sessionUserRole );
 			empresaId = ( String ) session.getAttribute( sessionEmpresaId );
+			username = ( String ) session.getAttribute( sessionUser );
 			
 			if ( userRole.equals( superUserRole ) || userRole.equals( empresaId ) )
 			{
@@ -53,15 +53,39 @@ public class doGetListaEstabelecimentos extends siprpServlet
 				int index = 0;
 				int max = rs.columnLength();
 				
+				//Buscar estabelecimento do utilizador
+				ResultSet2DArray result;
+				StringBuffer estabQuery = new StringBuffer();
+				Connection con2 = DriverManager.getConnection( bdUrl, bdUsername, bdPassword );
+				estabQuery.append( "SELECT estabelecimento_id FROM roles WHERE username = '" + username + "'" );
+				Statement stat = con2.createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY );
+				result = new ResultSet2DArray( stat.executeQuery( estabQuery.toString() ) );
+				String estabelecimento = null;
+				if(result.columnLength() > 0)
+				{
+					estabelecimento = "" + result.get(0, 0);
+				}
+				
 				while ( index < max )
 				{
 					temp = "" + rs.get( index, 0 ); // converter de int para
-													// String
-					dbQuery = new StringBuffer();
-					dbQuery.append( "/" + servletName + "/?" + empresaId + "/" + temp ); // contruir
-																							// url
-					links.add( dbQuery.toString() );
-					desc.add( ( String ) rs.get( index, 1 ) );
+					// String
+					if( estabelecimento.equals("null") )
+					{
+						dbQuery = new StringBuffer();
+						dbQuery.append( "/" + servletName + "/?" + empresaId + "/" + temp ); // contruir
+						// url
+						links.add( dbQuery.toString() );
+						desc.add( ( String ) rs.get( index, 1 ) );
+					}
+					else if( temp.equals(estabelecimento) )
+					{
+						dbQuery = new StringBuffer();
+						dbQuery.append( "/" + servletName + "/?" + empresaId + "/" + temp ); // contruir
+						// url
+						links.add( dbQuery.toString() );
+						desc.add( ( String ) rs.get( index, 1 ) );
+					}
 					++index;
 				}
 				sBuffer = new StringBuffer();