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

改进模型关联

Browse Source
This commit is contained in:
thinkphp
2017-04-01 12:50:32 +08:00
parent f72ff880dd
commit ae501f4028
8 changed files with 113 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
library/think/model/relation/MorphOne.php
View File

@@ -117,9 +117,14 @@ class MorphOne extends Relation
// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
$relationModel = null;
} else {
$relationModel = $data[$result->$pk];
$relationModel->setParent($result);
$relationModel->isUpdate(true);
}
$result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
$result->setAttr($attr, $relationModel);
}
}
}
@@ -137,11 +142,21 @@ class MorphOne extends Relation
{
$pk = $result->getPk();
if (isset($result->$pk)) {
$pk = $result->$pk;
$data = $this->eagerlyMorphToOne([
$this->morphKey => $result->$pk,
$this->morphKey => $pk,
$this->morphType => $this->type,
], $relation, $subRelation, $closure);
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk]));
if (isset($data[$pk])) {
$relationModel = $data[$pk];
$data[$pk]->setParent($result);
$relationModel->isUpdate(true);
} else {
$relationModel = null;
}
$result->setAttr(Loader::parseName($relation), $relationModel);
}
}