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-01-21 23:01:31 +08:00
parent 0944d0fe0e
commit a7a0051a78
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/model/relation/BelongsToMany.php
View File

@@ -109,14 +109,15 @@ class BelongsToMany extends Relation
$range,
],
], $relation, $subRelation);
// 关联属性名
$attr = Loader::parseName($relation);
// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
}
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk], $class));
$result->setAttr($attr, $this->resultSetBuild($data[$result->$pk], $class));
}
}
}
@@ -143,7 +144,7 @@ class BelongsToMany extends Relation
if (!isset($data[$pk])) {
$data[$pk] = [];
}
$result->setAttr($relation, $this->resultSetBuild($data[$pk], $class));
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$pk], $class));
}
}