diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 0d3217a3..2aff7771 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" && (