diff --git a/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml b/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml index 7f2d9ad4..9d60be44 100644 --- a/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml +++ b/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml @@ -1,7 +1,7 @@ - + diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index 31c74e2e..763b41ff 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -446,7 +446,7 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += "WHERE fase > 1 AND fase < 6"; break; } - if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA) { sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); } @@ -461,7 +461,7 @@ public class PlanosDataProvider extends GenericDataProvider{ int userType = u.getTipo().intValue(); Statement st = createStatement(); String sql = "select * from planos_actuacao where fase = 6"; - if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA) { sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); }