diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java index 0c01ba212..3e78488f4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java @@ -429,7 +429,7 @@ public class SisdapHibernateDAO implements SisdapDAO { sb.append(" FROM categoria "); sb.append(" WHERE grupocategoria_id IN ( 3 )) THEN Count(*) END, 0) descontoidosovolta "); sb.append(" FROM ruta_empresa re "); - sb.append(" left join marca m ON m.marca_id = re.empresa_id "); + sb.append(" left join marca m ON m.empresa_id = re.empresa_id "); sb.append(" left join empresa e ON m.empresa_id = e.empresa_id "); sb.append(" left join ruta r ON re.ruta_id = r.ruta_id "); sb.append(" left join corrida c ON c.ruta_id = r.ruta_id "); @@ -437,9 +437,10 @@ public class SisdapHibernateDAO implements SisdapDAO { sb.append(" left outer join parada po ON po.parada_id = b.origen_id "); sb.append(" left outer join parada pd ON pd.parada_id = b.destino_id "); - sb.append(" WHERE m.marca_id = ? "); + sb.append(" WHERE m.empresa_id = ? "); sb.append(" AND re.activo = 1 "); sb.append(" AND r.activo = 1 "); + sb.append(" AND e.activo = 1 "); sb.append(" AND r.orgaoconcedente_id = 3 "); sb.append(" AND b.numasiento IS NOT NULL "); sb.append(" AND b.motivocancelacion_id IS NULL ");