Query类relation支持嵌套关联

This commit is contained in:
thinkphp
2017-01-16 15:52:21 +08:00
parent 00136a3f4b
commit 47a869f3af
8 changed files with 27 additions and 17 deletions

View File

@@ -38,10 +38,11 @@ class HasOne extends OneToOne
/**
* 延迟获取关联数据
* @param string $subRelation 子关联名
* @param \Closure $closure 闭包查询条件
* @access public
*/
public function getRelation($colsure = null)
public function getRelation($subRelation = '', $colsure = null)
{
// 执行关联定义方法
$localKey = $this->localKey;
@@ -49,7 +50,7 @@ class HasOne extends OneToOne
call_user_func_array($closure, [ & $this->query]);
}
// 判断关联类型执行查询
return $this->query->where($this->foreignKey, $this->parent->$localKey)->find();
return $this->query->where($this->foreignKey, $this->parent->$localKey)->relation($subRelation)->find();
}
/**