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

改进with方法

Browse Source
This commit is contained in:
thinkphp
2016-04-12 22:20:55 +08:00
parent d8e3a35895
commit 81a74f90ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -758,14 +758,15 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 支持闭包查询过滤关联条件 // 支持闭包查询过滤关联条件
call_user_func_array($relation, [ & $db]); call_user_func_array($relation, [ & $db]);
$relation = $key; $relation = $key;
} elseif (is_string($relation) && strpos($relation, '.')) {
list($relation, $subRelation) = explode('.', $relation);
} }
} }
$class = new static(); $class = new static();
foreach ($with as $key => $name) { foreach ($with as $key => $name) {
if (is_string($name) && strpos($name, '.')) {
list($name) = explode('.', $name);
}
$i = 0; $i = 0;
$model = $class->$name(); $model = $class->$name();
list($type, $foreignKey, $localKey) = $class->relation; list($type, $foreignKey, $localKey) = $class->relation;
@@ -877,8 +878,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
case self::HAS_MANY: case self::HAS_MANY:
case self::BELONGS_TO_MANY: case self::BELONGS_TO_MANY:
if (isset($result->$localKey)) { if (isset($result->$localKey)) {
$data = $this->modelRelationQuery($model, $resultSet, [$foreignKey => $result->$localKey], $relation, $subRelation); $data = $this->modelRelationQuery($model, [$foreignKey => $result->$localKey], $relation, $subRelation);
// 关联数据封装 // 关联数据封装
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = []; $data[$result->$localKey] = [];