From 61462a628e070695148fdafae44d16f267fa7b99 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 30 Nov 2016 17:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=A4=9A=E5=AF=B9=E5=A4=9A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Relation.php | 54 +++++++++++++++++---------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/library/think/model/Relation.php b/library/think/model/Relation.php
index f9675c14..bec70387 100644
--- a/library/think/model/Relation.php
+++ b/library/think/model/Relation.php
@@ -662,32 +662,36 @@ class Relation
 
     public function __call($method, $args)
     {
+        static $baseQuery = [];
         if ($this->query) {
-            switch ($this->type) {
-                case self::HAS_MANY:
-                    if (isset($this->where)) {
-                        $this->query->where($this->where);
-                    } elseif (isset($this->parent->{$this->localKey})) {
-                        // 关联查询带入关联条件
-                        $this->query->where($this->foreignKey, $this->parent->{$this->localKey});
-                    }
-                    break;
-                case self::HAS_MANY_THROUGH:
-                    $through      = $this->middle;
-                    $model        = $this->model;
-                    $alias        = Loader::parseName(basename(str_replace('\\', '/', $model)));
-                    $throughTable = $through::getTable();
-                    $pk           = (new $this->model)->getPk();
-                    $throughKey   = $this->throughKey;
-                    $modelTable   = $this->parent->getTable();
-                    $this->query->field($alias . '.*')->alias($alias)
-                        ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
-                        ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
-                        ->where($throughTable . '.' . $this->foreignKey, $this->parent->{$this->localKey});
-                    break;
-                case self::BELONGS_TO_MANY:
-                    // TODO
-
+            if (empty($baseQuery[$this->type])) {
+                $baseQuery[$this->type] = true;
+                switch ($this->type) {
+                    case self::HAS_MANY:
+                        if (isset($this->where)) {
+                            $this->query->where($this->where);
+                        } elseif (isset($this->parent->{$this->localKey})) {
+                            // 关联查询带入关联条件
+                            $this->query->where($this->foreignKey, $this->parent->{$this->localKey});
+                        }
+                        break;
+                    case self::HAS_MANY_THROUGH:
+                        $through      = $this->middle;
+                        $model        = $this->model;
+                        $alias        = Loader::parseName(basename(str_replace('\\', '/', $model)));
+                        $throughTable = $through::getTable();
+                        $pk           = (new $this->model)->getPk();
+                        $throughKey   = $this->throughKey;
+                        $modelTable   = $this->parent->getTable();
+                        $this->query->field($alias . '.*')->alias($alias)
+                            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
+                            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
+                            ->where($throughTable . '.' . $this->foreignKey, $this->parent->{$this->localKey});
+                        break;
+                    case self::BELONGS_TO_MANY:
+                        $pk = $this->parent->getPk();
+                        $this->query->join($this->middle . ' pivot', 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())->where('pivot.' . $this->localKey, $this->parent->$pk);
+                }
             }
             $result = call_user_func_array([$this->query, $method], $args);
             if ($result instanceof \think\db\Query) {