From 50276ce1cb9583215a075350ec939b85a0fa341e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 30 Aug 2023 17:11:23 +0800
Subject: [PATCH] update

---
 src/forge/Merge/MessageCount.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 25b8b17b..b8316c78 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -371,7 +371,8 @@ class MessageCount extends Component {
     const userLogin = current_user && current_user.login;
     const otherPre = data && data.pull_request && projectDetail && (userLogin === data.pull_request.fork_project_user && projectDetail.permission==="");
     const permissionByCodeReview = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission === "Manager" || projectDetail.permission === "Developer" || otherPre);
-    const operate = userLogin && projectDetail && pr_status === 0 && ( permission || otherPre);
+    const operate = userLogin && projectDetail && pr_status === 0 && permission ;
+    const cancelOperate = userLogin && projectDetail && pr_status === 0 && ( permission || otherPre);
     const open_blockchain = project && project.open_blockchain;
     return (
       <div>
@@ -521,7 +522,7 @@ class MessageCount extends Component {
                       </Button>
                     )}
 
-                      {operate && (
+                      {cancelOperate && (
                         <Button
                           type="danger"
                           ghost