From f3c4cf2b25054b18cc070496b11b8ef7b61ccbc6 Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Fri, 3 Mar 2017 12:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/relation/BelongsToMany.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/library/think/model/relation/BelongsToMany.php b/library/think/model/relation/BelongsToMany.php
index 015d86d5..34830e05 100644
--- a/library/think/model/relation/BelongsToMany.php
+++ b/library/think/model/relation/BelongsToMany.php
@@ -370,10 +370,14 @@ class BelongsToMany extends Relation
         // 关联查询封装
         $tableName  = $this->query->getTable();
         $relationFk = $this->query->getPk();
-        return $this->query->field($tableName . '.*')
-            ->field(true, false, $table, 'pivot', 'pivot__')
-            ->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
-            ->where($condition);
+        $query      = $this->query->field($tableName . '.*')
+            ->field(true, false, $table, 'pivot', 'pivot__');
+
+        if (empty($this->baseQuery)) {
+            $query->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+                ->where($condition);
+        }
+        return $query;
     }
 
     /**