改进一对一关联

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();

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);