mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进一对多with关联查询的field支持

Browse Source
This commit is contained in:
thinkphp
2017-11-24 17:36:43 +08:00
parent 5706ed7e44
commit 6381d65bb3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/model/relation/HasMany.php
View File

@@ -77,7 +77,7 @@ class HasMany extends Relation
}
if (!empty($range)) {
$data = $this->eagerlyOneToMany(new $this->model, [
$data = $this->eagerlyOneToMany($this->query, [
$this->foreignKey => [
'in',
$range,
@@ -114,7 +114,7 @@ class HasMany extends Relation
$localKey = $this->localKey;
if (isset($result->$localKey)) {
$data = $this->eagerlyOneToMany(new $this->model, [$this->foreignKey => $result->$localKey], $relation, $subRelation, $closure);
$data = $this->eagerlyOneToMany($this->query, [$this->foreignKey => $result->$localKey], $relation, $subRelation, $closure);
// 关联数据封装
if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = [];