This commit is contained in:
yuri
2019-01-18 16:37:24 +02:00
parent af991b4008
commit d4ea6d146a
2 changed files with 8 additions and 8 deletions
@@ -35,15 +35,15 @@ class Person extends \Espo\Services\Record
{
protected function getDuplicateWhereClause(Entity $entity, $data)
{
$data = array(
$whereClause = [
'OR' => []
);
];
$toCheck = false;
if ($entity->get('firstName') || $entity->get('lastName')) {
$part = [];
$part['firstName'] = $entity->get('firstName');
$part['lastName'] = $entity->get('lastName');
$data['OR'][] = $part;
$whereClause['OR'][] = $part;
$toCheck = true;
}
if (
@@ -62,9 +62,9 @@ class Person extends \Espo\Services\Record
}
}
foreach ($list as $emailAddress) {
$data['OR'][] = array(
$whereClause['OR'][] = [
'emailAddress' => $emailAddress
);
];
$toCheck = true;
}
}
@@ -72,7 +72,7 @@ class Person extends \Espo\Services\Record
return false;
}
return $data;
return $whereClause;
}
}
@@ -52,9 +52,9 @@ class Account extends \Espo\Services\Record
if (!$entity->get('name')) {
return false;
}
return array(
return [
'name' => $entity->get('name')
);
];
}
protected function afterMerge(Entity $entity, array $sourceList, $attributes)