From 36a58c0fe3cacf96ba60d738c29c9300a3325857 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 30 Nov 2021 14:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge.js                       | 2 +-
 src/forge/users/GeneralView/ConcentrateBox.jsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 8a0eaedea..b55f596b9 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -414,7 +414,7 @@ class merge extends Component {
             ) : (
               ""
             )}
-            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
+            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" user_admin_or_member={data.user_admin_or_member} projectsId={projectsId} owner={owner} /> :""}
           </Spin>
         </div>
       </div>
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx
index b3812b965..001b598dc 100644
--- a/src/forge/users/GeneralView/ConcentrateBox.jsx
+++ b/src/forge/users/GeneralView/ConcentrateBox.jsx
@@ -9,7 +9,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
   const [ page , setPage ]= useState(1);
   const [ total , setTotal ]= useState(0);
   const [ pageSize , setPageSize ] = useState(false);
-  const [ search , setSearch ] = useState(undefined);
+  const [ search , setSearch ] = useState("");
 
   const [ list , setList ]= useState([]);
   const [ value , setValue ]= useState([]);
@@ -24,7 +24,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
       setIsSpin(true);
       getProjectList();
     }else{
-      setSearch(undefined);
+      setSearch("");
       setCopyAllList([]);
       setCopyList([]);
       setList([]);