Changeset 2056 for trunk/workflow/inc/class.so_userinterface.inc.php

Timestamp:

02/23/10 15:28:20 (14 years ago)

Author:

pedroerp

Message:

Ticket #441 - Corrigindo erro de lógica em algumas consultas.

File:

• trunk/workflow/inc/class.so_userinterface.inc.php (modified) (2 diffs)

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -234 +234 @@
 
                 /* gather some info from the area */
-                $areaInfo = $this->db->query('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_id FROM area a LEFT OUTER JOIN substituicao s USING(area_id) WHERE (a.organizacao_id = ?) AND (a.area_id = ?) AND ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) OR (s.substituicao_id IS NULL))', array($organizationID, $areaID))->GetArray(-1);
+                $areaInfo = $this->db->query('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_id FROM area a LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (a.organizacao_id = ?) AND (a.area_id = ?)', array($organizationID, $areaID))->GetArray(-1);
                 if (empty($areaInfo))
                         return false;
@@ -509 +509 @@
         function getAreaWithSubtituteBoss( $organizationID )
         {
-                $result = $this -> db -> query( "SELECT a.sigla as area, a.titular_funcionario_id as titular, s.funcionario_id as substituto, s.data_inicio, s.data_fim FROM area a INNER JOIN substituicao s USING (area_id) WHERE (organizacao_id = ?) and CURRENT_DATE BETWEEN data_inicio AND data_fim ORDER BY area", array( $organizationID ) );
+                $result = $this -> db -> query( "SELECT a.sigla as area, a.titular_funcionario_id as titular, s.funcionario_id as substituto, s.data_inicio, s.data_fim FROM area a INNER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (organizacao_id = ?) ORDER BY area", array( $organizationID ) );
 
                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' );