From b1243642039b62102ba90ccecdb51f1a38bd18f7 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 1 Nov 2021 14:40:41 +0800
Subject: [PATCH] =?UTF-8?q?pr=E4=B8=AD=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js    | 10 +++++-----
 src/forge/Merge/MessageCount.js |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 61477c14..3e88eeb9 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -112,9 +112,9 @@ class MergeItem extends Component {
                             to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                             className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
-                            {item.is_original
-                              ? item.fork_project_user
-                              : project_author_name}
+                            {item.is_fork
+                              ? item.pull_request_base
+                              : item.author_name}
                             :{item.pull_request_head}
                           </Link>
                         </Tag>
@@ -136,8 +136,8 @@ class MergeItem extends Component {
                             to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
-                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
-                            {project_author_name}:{item.pull_request_base}
+                            {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`}
+                            {/* {project_author_name}:{item.pull_request_base} */}
                           </Link>
                         </Tag>
                       }
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 6d01e8a3..d7f665dd 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -365,10 +365,10 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/${data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                             className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: ${data.pull_request && data.pull_request.head}`}
                           >
-                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head}
+                            {data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}: {data.pull_request && data.pull_request.head}
                           </Link>
                         </Tag>
                         <span className="mr8 ver-middle">
@@ -383,7 +383,7 @@ class MessageCount extends Component {
                             to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                             className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
                           >
-                            {data.issue.project_author_name}:{data.pull_request.base}
+                            {data.issue.author_name}:{data.pull_request.base}
                           </Link>
                         </Tag>
                       </div>