Skip to content

Commit 006ad4b

Browse files
committed
改进
1 parent 63f2f82 commit 006ad4b

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/model/concern/RelationShip.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,18 +425,13 @@ public function eagerlyResultSet(array $resultSet, array $relations, array $with
425425
if (is_array($relation)) {
426426
$subRelation = $relation;
427427
$relation = $key;
428-
} elseif (is_string($relation)) {
429-
if (str_contains($relation, '.')) {
430-
[$relation, $subRelation] = explode('.', $relation, 2);
431-
432-
$subRelation = [$subRelation];
433-
} elseif (is_string($key)) {
434-
$relationName = $relation;
435-
$relation = $key;
436-
}
428+
} elseif (str_contains($relation, '.')) {
429+
[$relation, $subRelation] = explode('.', $relation, 2);
430+
431+
$subRelation = [$subRelation];
437432
}
438433

439-
$relationName = $relationName ?? $relation;
434+
$relationName = $relation;
440435
$relation = Str::camel($relation);
441436
$relationResult = $this->$relation();
442437

0 commit comments

Comments
 (0)