diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index a13f7780d..5b50f6ba0 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -407,7 +407,7 @@ class merge extends Component {
         </div>
         <div style={{minHeight:"470px"}}>
           <Spin spinning={isSpin}>
-            {data && data.search_count && data.search_count > 0 && (
+            {data && data.search_count && data.search_count > 0 ? (
               <div>
                 <OrderItem
                   issues={issues}
@@ -421,8 +421,8 @@ class merge extends Component {
                 ></OrderItem>
                 {Paginations}
               </div>
-            )}
-            { data && data.search_count && data.search_count === 0 && <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> }
+            ):""}
+            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
           </Spin>
         </div>
       </div>
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 2e3b132d2..0ae88ddf3 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -163,7 +163,7 @@ class Milepost extends Component {
 
     return (
       <Spin spinning={spinings}>
-        <div className="main">
+        <div className="main" style={{minHeight:"400px"}}>
           <div style={{ display: this.state.display }}>
             <div className="tagdiv" >
               <span>里程碑{data && data.issue_tags_count}已创建</span>
@@ -252,7 +252,7 @@ class Milepost extends Component {
                 }
               </div>
           }
-          { data && data.versions &&  data.versions.length === 0 && <NoneData></NoneData> }
+          { data && data.versions &&  data.versions.length === 0 && <NoneData _html="暂无里程碑"></NoneData> }
           {
             data && data.versions_count > limit ?
               <div className="mt30 mb50 edu-txt-center">