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

修正Relation

Browse Source
This commit is contained in:
thinkphp
2016-04-17 13:10:47 +08:00
parent e5e358303b
commit 14e44291e4
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.php
View File

@@ -112,7 +112,7 @@ class Relation
case self::BELONGS_TO: case self::BELONGS_TO:
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
// 模型关联组装 // 模型关联组装
$this->modelRelationBuild($model, $relation, $result); $this->match($model, $relation, $result);
} }
break; break;
case self::HAS_MANY: case self::HAS_MANY:
@@ -126,7 +126,7 @@ class Relation
} }
if (!empty($range)) { if (!empty($range)) {
$data = $this->modelRelationQuery($model, [$foreignKey => ['in', $range]], $relation, $subRelation); $data = $this->eagerly($model, [$foreignKey => ['in', $range]], $relation, $subRelation);
// 关联数据封装 // 关联数据封装
foreach ($resultSet as $result) { foreach ($resultSet as $result) {