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

优化

Browse Source
This commit is contained in:
thinkphp
2017-03-17 19:42:23 +08:00
parent 1f0d3bd74a
commit 8c79c435f5
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/relation/BelongsToMany.php
View File

@@ -374,13 +374,13 @@ class BelongsToMany extends Relation
protected function belongsToManyQuery($foreignKey, $localKey, $condition = []) protected function belongsToManyQuery($foreignKey, $localKey, $condition = [])
{ {
// 关联查询封装 // 关联查询封装
$tableName = $this->query->getTable(); $tableName = $this->query->getTable();
$relationFk = $this->query->getPk(); $table = $this->pivot->getTable();
$table = $this->pivot->getTable(); $query = $this->query->field($tableName . '.*')
$query = $this->query->field($tableName . '.*')
->field(true, false, $table, 'pivot', 'pivot__'); ->field(true, false, $table, 'pivot', 'pivot__');
if (empty($this->baseQuery)) { if (empty($this->baseQuery)) {
$relationFk = $this->query->getPk();
$query->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk) $query->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
->where($condition); ->where($condition);
} }