From 95e9d848f72211eba2af63d555f14810aa36dac6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 2 Mar 2018 15:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=B8=80=E5=AF=B9=E4=B8=80?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/relation/BelongsTo.php | 1 +
 library/think/model/relation/HasOne.php    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/think/model/relation/BelongsTo.php b/library/think/model/relation/BelongsTo.php
index e609a876..c1cbab97 100644
--- a/library/think/model/relation/BelongsTo.php
+++ b/library/think/model/relation/BelongsTo.php
@@ -52,6 +52,7 @@ class BelongsTo extends OneToOne
             call_user_func_array($closure, [ & $this->query]);
         }
         $relationModel = $this->query
+            ->removeWhereField($this->localKey)
             ->where($this->localKey, $this->parent->$foreignKey)
             ->relation($subRelation)
             ->find();
diff --git a/library/think/model/relation/HasOne.php b/library/think/model/relation/HasOne.php
index 3c036c01..db74e4a6 100644
--- a/library/think/model/relation/HasOne.php
+++ b/library/think/model/relation/HasOne.php
@@ -50,7 +50,11 @@ class HasOne extends OneToOne
             call_user_func_array($closure, [ & $this->query]);
         }
         // 判断关联类型执行查询
-        $relationModel = $this->query->where($this->foreignKey, $this->parent->$localKey)->relation($subRelation)->find();
+        $relationModel = $this->query
+            ->removeWhereField($this->foreignKey)
+            ->where($this->foreignKey, $this->parent->$localKey)
+            ->relation($subRelation)
+            ->find();
 
         if ($relationModel) {
             $relationModel->setParent(clone $this->parent);