partial fix ted 46583

1 files changed, 19 insertions, 3 deletions

diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/filter/DimensionFilterEvalHelper.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/filter/DimensionFilterEvalHelper.java
index 12f8f37..0e89758 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/filter/DimensionFilterEvalHelper.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/filter/DimensionFilterEvalHelper.java
@@ -46,6 +46,18 @@ BaseDimensionFilterEvalHelper implements IJSDimensionFilterHelper
 	}
 	
 
+	private boolean containsInAggrLevels( String level )
+	{
+		for ( DimLevel dimLevel : aggrLevels )
+		{
+			if ( dimLevel.getLevelName( ).equals( level ) )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	 
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.birt.data.engine.olap.util.filter.IJsFilter#evaluateFilter(org.eclipse.birt.data.engine.olap.util.filter.IResultRow)
@@ -63,11 +75,15 @@ BaseDimensionFilterEvalHelper implements IJSDimensionFilterHelper
 				for ( int i = 0; i < axisLevels.length; i++ )
 				{
 					DimLevel level = new DimLevel( axisLevels[i] );
-					if ( CompareUtil.compare( resultRow.getFieldValue( level.toString( ) ),
-							axisValues[i] ) != 0 )
+					if ( containsInAggrLevels( level.getLevelName( ) ) )
 					{
-						return false;
+						if ( CompareUtil.compare( resultRow.getFieldValue( level.toString( ) ),
+								axisValues[i] ) != 0 )
+						{
+							return false;
+						}
 					}
+					
 				}
 			}
 			Object result = ScriptEvalUtil.evalExpr( expr, cx.newContext( scope ), ScriptExpression.defaultID, 0 );