From 07511efbd621e6a041b0a37554f680d1a23ed621 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Nov 2021 10:55:50 +0800
Subject: [PATCH] =?UTF-8?q?issue-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge_form.js        |  4 ++--
 src/forge/users/Statistics/Index.jsx | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index d050116f..c6de9638 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -167,8 +167,8 @@ class MergeForm extends Component {
               this.setState({
                 isSpin: false,
               });
-              const { pull_request_id } = result.data;
-              this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`);
+              const { pull_request_number } = result.data;
+              this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_number}`);
               const { getDetail } = this.props;
               getDetail && getDetail();
             } else {
diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx
index aca25eb1..91118a67 100644
--- a/src/forge/users/Statistics/Index.jsx
+++ b/src/forge/users/Statistics/Index.jsx
@@ -9,6 +9,7 @@ import Pie from '../Echart/Pie';
 import Cloud from '../Echart/Cloud';
 import Radar from '../Echart/Radar';
 import Round from '../Echart/Round';
+import Nodata from '../../Nodata';
 import { DatePicker } from 'antd';
 import moment from 'moment';
 
@@ -120,7 +121,7 @@ function Index(props) {
       }
     }).then(result=>{
       if(result && result.data){
-        setCloudData(result.data);
+        setCloudData({categories:[]});
       }
     }).catch(error=>{})
   }
@@ -148,7 +149,7 @@ function Index(props) {
             </div>
           }
           {
-            percentData &&
+            percentData && percentData.length >0 &&
             <div className="pBox">
               <div className="progress">
                 {
@@ -200,7 +201,12 @@ function Index(props) {
         </FlexAJ>
         <div className="echartBox">
           <p>展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。</p>
-          <Cloud data={cloudData}/>
+          {
+            cloudData && cloudData.length >0?
+            <Cloud data={cloudData}/>
+            :
+            <Nodata _html="暂无数据" small={true}/>
+          }
         </div>
       </div>
     </div>