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

关联预载入方法调整 取消class参数 关联的数据集查询根据模型的数据集返回类型设定

Browse Source
This commit is contained in:
thinkphp
2017-01-22 12:42:24 +08:00
parent a7a0051a78
commit 6f02e4b127
12 changed files with 79 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/model/relation/HasMany.php
View File

@@ -60,7 +60,7 @@ class HasMany extends Relation
* @param string $class 数据集对象名 为空表示数组
* @return void
*/
public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
{
$localKey = $this->localKey;
$range = [];
@@ -72,8 +72,7 @@ class HasMany extends Relation
}
if (!empty($range)) {
$this->where[$this->foreignKey] = ['in', $range];
$data = $this->eagerlyOneToMany($this, [
$data = $this->eagerlyOneToMany($this, [
$this->foreignKey => [
'in',
$range,
@@ -86,7 +85,7 @@ class HasMany extends Relation
if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = [];
}
$result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey], $class));
$result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey]));
}
}
}
@@ -101,7 +100,7 @@ class HasMany extends Relation
* @param string $class 数据集对象名 为空表示数组
* @return void
*/
public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
public function eagerlyResult(&$result, $relation, $subRelation, $closure)
{
$localKey = $this->localKey;
@@ -111,7 +110,7 @@ class HasMany extends Relation
if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = [];
}
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey], $class));
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey]));
}
}
@@ -259,9 +258,7 @@ class HasMany extends Relation
protected function baseQuery()
{
if (empty($this->baseQuery)) {
if (isset($this->where)) {
$this->query->where($this->where);
} elseif (isset($this->parent->{$this->localKey})) {
if (isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件
$this->query->where($this->foreignKey, $this->parent->{$this->localKey});
}