|
@@ -366,9 +366,13 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
|
|
|
if nil != value.Relation && KeyTypeRelation == value.Type && 0 < len(value.Relation.Contents) && nil != filter && nil != filter.Value && KeyTypeRelation == filter.Value.Type &&
|
|
|
nil != filter.Value.Relation && 0 < len(filter.Value.Relation.BlockIDs) {
|
|
|
// 单独处理关联类型的比较
|
|
|
- relationValue := value.Relation.Contents[0]
|
|
|
- filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}}
|
|
|
- return relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator)
|
|
|
+ for _, relationValue := range value.Relation.Contents {
|
|
|
+ filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}}
|
|
|
+ if relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false
|
|
|
}
|
|
|
|
|
|
return value.filter(filter.Value, filter.RelativeDate, filter.RelativeDate2, filter.Operator)
|