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

修正多对多预载入查询

Browse Source
This commit is contained in:
thinkphp
2016-07-02 18:51:28 +08:00
parent 2cb8022982
commit 0f58b08bec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model/Relation.php
View File

@@ -197,7 +197,7 @@ class Relation
if (!empty($range)) { if (!empty($range)) {
// 查询关联数据 // 查询关联数据
$data = $this->eagerlyManyToMany($model, [ $data = $this->eagerlyManyToMany($model, [
'pivot.' . $foreignKey => [ 'pivot.' . $localKey => [
'in', 'in',
$range, $range,
], ],
@@ -277,7 +277,7 @@ class Relation
if (isset($result->$pk)) { if (isset($result->$pk)) {
$pk = $result->$pk; $pk = $result->$pk;
// 查询管理数据 // 查询管理数据
$data = $this->eagerlyManyToMany($model, ['pivot.' . $foreignKey => $pk], $relation, $subRelation); $data = $this->eagerlyManyToMany($model, ['pivot.' . $localKey => $pk], $relation, $subRelation);
// 关联数据封装 // 关联数据封装
if (!isset($data[$pk])) { if (!isset($data[$pk])) {
@@ -374,7 +374,7 @@ class Relation
} }
} }
$set->pivot = new Pivot($pivot, $this->middle); $set->pivot = new Pivot($pivot, $this->middle);
$data[$set->$foreignKey][] = $set; $data[$pivot[$localKey]][] = $set;
} }
return $data; return $data;
} }