From 0dd33faeb5d7cdddf3cc26a51a2e891ba00d1b81 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 9 Nov 2020 09:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Merge/MessageCount.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 0d3217a34..2aff7771d 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -73,7 +73,7 @@ class MessageCount extends Component {
this.setState({
data: result.data,
SpinFlag: false,
- pr_status: result.data.pull_request.status,
+ pr_status: result.data && result.data.pull_request && result.data.pull_request.status,
});
} else {
this.setState({ SpinFlag: false });
@@ -402,7 +402,7 @@ class MessageCount extends Component {
下载为
*/}
{current_user && projectDetail &&
- pr_status !== 2 &&
+ pr_status === 0 &&
projectDetail.permission !=="Reporter" && (