diff --git a/src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php b/src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php index 5ea3217..4b1400e 100644 --- a/src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php +++ b/src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php @@ -39,7 +39,10 @@ public function expand($values) { foreach ((array) $values as $value) { $query = \Drupal::entityQuery($entity_type_id); $or = $query->orConditionGroup(); - $or->condition($id_key, $value) + $id_group = $query->andConditionGroup() + ->condition($id_key, $value) + ->condition($id_key, 0, '<>'); + $or->condition($id_group) ->condition($label_key, $value); $query->condition($or); $query->accessCheck(FALSE);