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

改进模型的appendRelationAttr方法

Browse Source
This commit is contained in:
thinkphp
2017-05-14 13:46:02 +08:00
parent 629a194211
commit 13a5a3d9b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Model.php
View File

@@ -661,10 +661,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$relation = Loader::parseName($relation, 1, false); $relation = Loader::parseName($relation, 1, false);
// 获取关联数据
if (isset($this->relation[$relation])) { if (isset($this->relation[$relation])) {
$model = $this->relation[$relation]; $model = $this->relation[$relation];
} else { } else {
$model = $this->getAttr($relation); $model = $this->getRelationData($this->$relation());
} }
if ($model instanceof Model) { if ($model instanceof Model) {