From 7d315ebc47c481bd15eb8d4e3e3548ed1e827236 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Sat, 15 Aug 2020 15:14:32 +0800
Subject: [PATCH] change

---
 src/forge/Merge/NewMerge.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index ebaba5f1..5fe2a0d3 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -132,7 +132,7 @@ class NewMerge extends Component {
       merge_head: is_fork_id,
       data: {
         is_original: is_fork_id,
-        fork_project_id: is_fork_id ? project_id : "",
+        fork_project_id: is_fork_id ? id : "",
         merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
       }
     })
@@ -146,13 +146,13 @@ class NewMerge extends Component {
   ischeckmerge = () => {
     this.setState({ isSpin: true });
     const { projectsId , owner } = this.props.match.params;
-    const { pull, merge, project_id, merge_head } = this.state;
+    const { pull, merge, project_id, merge_head, id } = this.state;
     const url = `/${owner}/${projectsId}/pulls/check_can_merge.json`;
     axios.post(url, {
       head: pull,
       base: merge,
       is_original: merge_head,
-      fork_project_id: merge_head ? project_id : undefined
+      fork_project_id: merge_head ? id : undefined
     })
     .then((result) => {
       if (result) {