From a4b5d8908fce01c67c75084bdd469a72dd5ccc42 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 25 Nov 2017 10:54:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php               | 1 +
 library/think/model/relation/HasMany.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index a39f2387..f2a8e455 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1239,6 +1239,7 @@ class Query
         $logic = strtoupper($logic);
         if (isset($this->options['where'][$logic][$field])) {
             unset($this->options['where'][$logic][$field]);
+            unset($this->options['multi'][$logic][$field]);
         }
         return $this;
     }
diff --git a/library/think/model/relation/HasMany.php b/library/think/model/relation/HasMany.php
index e0754c72..a27ec2ea 100644
--- a/library/think/model/relation/HasMany.php
+++ b/library/think/model/relation/HasMany.php
@@ -185,7 +185,7 @@ class HasMany extends Relation
         if ($closure) {
             call_user_func_array($closure, [ & $model]);
         }
-        $list = $model->where($where)->with($subRelation)->select();
+        $list = $model->removeWhereField($foreignKey)->where($where)->with($subRelation)->select();
 
         // 组装模型数据
         $data = [];

From b2d7453aafc95d005cb3e0488b3972b1e12e6c6b Mon Sep 17 00:00:00 2001
From: Chino Chang <me@7in0.me>
Date: Sat, 25 Nov 2017 18:49:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=AF=AF=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b40ef90..dc8e91cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ GitHub 提供了 Issue 功能，该功能可以用于：
 6. 变基（衍合 `rebase`）你的分支到上游 master 分支；
 7. `push` 你的本地仓库到 GitHub；
 8. 提交 `pull request`；
-9. 等待 CI 验证（若不通过则重复 5~7，GitHub 会自动更新你的 `pull request`）；
+9. 等待 CI 验证（若不通过则重复 5~7，不需要重新提交 `pull request`，GitHub 会自动更新你的 `pull request`）；
 10. 等待管理员处理，并及时 `rebase` 你的分支到上游 master 分支（若上游 master 分支有修改）。
 
 *若有必要，可以 `git push -f` 强行推送 rebase 后的分支到自己的 `fork`*