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

修正Relation类

Browse Source
This commit is contained in:
thinkphp
2016-04-27 11:12:52 +08:00
parent d33a164c2f
commit fd6ca38265
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/model/Relation.php
View File

@@ -86,7 +86,7 @@ class Relation
// 关联查询 // 关联查询
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$condition['pivot.' . $foreignKey] = $this->parent->$pk; $condition['pivot.' . $foreignKey] = $this->parent->$pk;
$result = $this->belongsToManyQuery($this->model, $this->middle, $localKey, $foreignKey, $condition)->select(); $result = $this->belongsToManyQuery($relation, $this->middle, $localKey, $foreignKey, $condition)->select();
foreach ($result as $set) { foreach ($result as $set) {
$pivot = []; $pivot = [];
foreach ($set->toArray() as $key => $val) { foreach ($set->toArray() as $key => $val) {
@@ -152,7 +152,7 @@ class Relation
} }
if (!empty($range)) { if (!empty($range)) {
$data = $this->eagerlyOneToMany($this->model, [$foreignKey => ['in', $range]], $relation, $subRelation, $closure); $data = $this->eagerlyOneToMany($model, [$foreignKey => ['in', $range]], $relation, $subRelation, $closure);
// 关联数据封装 // 关联数据封装
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
@@ -176,7 +176,7 @@ class Relation
if (!empty($range)) { if (!empty($range)) {
// 查询关联数据 // 查询关联数据
$data = $this->eagerlyManyToMany($this->model, ['pivot.' . $foreignKey => ['in', $range]], $relation, $subRelation); $data = $this->eagerlyManyToMany($model, ['pivot.' . $foreignKey => ['in', $range]], $relation, $subRelation);
// 关联数据封装 // 关联数据封装
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
@@ -240,7 +240,7 @@ class Relation
if (isset($result->$pk)) { if (isset($result->$pk)) {
$pk = $result->$pk; $pk = $result->$pk;
// 查询管理数据 // 查询管理数据
$data = $this->eagerlyManyToMany($this->model, ['pivot.' . $foreignKey => $pk], $relation, $subRelation); $data = $this->eagerlyManyToMany($model, ['pivot.' . $foreignKey => $pk], $relation, $subRelation);
// 关联数据封装 // 关联数据封装
if (!isset($data[$pk])) { if (!isset($data[$pk])) {
@@ -287,7 +287,7 @@ class Relation
/** /**
* 一对多 关联模型预查询 * 一对多 关联模型预查询
* @access public * @access public
* @param string $model 模型名称 * @param object $model 关联模型对象
* @param array $where 关联预查询条件 * @param array $where 关联预查询条件
* @param string $relation 关联名 * @param string $relation 关联名
* @param string $subRelation 子关联 * @param string $subRelation 子关联
@@ -310,7 +310,7 @@ class Relation
/** /**
* 多对多 关联模型预查询 * 多对多 关联模型预查询
* @access public * @access public
* @param string $model 模型名称 * @param object $model 关联模型对象
* @param array $where 关联预查询条件 * @param array $where 关联预查询条件
* @param string $relation 关联名 * @param string $relation 关联名
* @param string $subRelation 子关联 * @param string $subRelation 子关联
@@ -426,7 +426,7 @@ class Relation
/** /**
* BELONGS TO MANY 关联查询 * BELONGS TO MANY 关联查询
* @access public * @access public
* @param string $model 模型名 * @param object $model 关联模型对象
* @param string $table 中间表名 * @param string $table 中间表名
* @param string $localKey 当前模型关联键 * @param string $localKey 当前模型关联键
* @param string $foreignKey 关联模型关联键 * @param string $foreignKey 关联模型关联键
@@ -436,8 +436,8 @@ class Relation
protected function belongsToManyQuery($model, $table, $localKey, $foreignKey, $condition = []) protected function belongsToManyQuery($model, $table, $localKey, $foreignKey, $condition = [])
{ {
// 关联查询封装 // 关联查询封装
$tableName = $model::getTable(); $tableName = $model->getTable();
$relationFk = (new $model)->getPk(); $relationFk = $model->getPk();
return $model::field($tableName . '.*') return $model::field($tableName . '.*')
->field(true, false, $table, 'pivot', 'pivot__') ->field(true, false, $table, 'pivot', 'pivot__')
->join($table . ' pivot', 'pivot.' . $localKey . '=' . $tableName . '.' . $relationFk) ->join($table . ' pivot', 'pivot.' . $localKey . '=' . $tableName . '.' . $relationFk)