diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 12db593a..a13f7780 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -273,7 +273,7 @@ class merge extends Component {
     );
     return (
       <div className="main">
-        <div className="topWrapper" style={{borderBottom:"1px solid #eee"}}>
+        <div className="topWrapper" style={{borderBottom:"none"}}>
           <div className="target-detail-search">
             <Search
               placeholder="输入关键字搜索合并请求"
@@ -405,26 +405,26 @@ class merge extends Component {
             </li>
           </ul>
         </div>
-
-        {data && data.search_count && data.search_count > 0 ? (
-          <div style={{minHeight:"470px"}}>
-            <Spin spinning={isSpin}>
-              <OrderItem
-                issues={issues}
-                search_count={search_count}
-                page={select_params.page}
-                limit={select_params.limit}
-                project_name={data.project_name}
-                project_author_name={data.project_author_name}
-                {...this.props}
-                {...this.state}
-              ></OrderItem>
-              {Paginations}
-            </Spin>
-          </div>
-        ) : (
-          <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} />
-        )}
+        <div style={{minHeight:"470px"}}>
+          <Spin spinning={isSpin}>
+            {data && data.search_count && data.search_count > 0 && (
+              <div>
+                <OrderItem
+                  issues={issues}
+                  search_count={search_count}
+                  page={select_params.page}
+                  limit={select_params.limit}
+                  project_name={data.project_name}
+                  project_author_name={data.project_author_name}
+                  {...this.props}
+                  {...this.state}
+                ></OrderItem>
+                {Paginations}
+              </div>
+            )}
+            { data && data.search_count && data.search_count === 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 e4a8d496..2e3b132d 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -191,10 +191,10 @@ class Milepost extends Component {
           </div>
           {
             data && data.versions && data.versions.length > 0
-              ?
+              &&
               <div className="tagList">
                 {
-                  data.versions.length === 0 ? <NoneData></NoneData> : data.versions.map((item, key) => {
+                  data.versions.map((item, key) => {
                     return (
                       <div style={{ display: 'block' }} key={key}>
                         <div className="milepostdiv">
@@ -251,8 +251,8 @@ class Milepost extends Component {
                   })
                 }
               </div>
-              : <NoneData _html="暂时还没有相关数据!" />
           }
+          { data && data.versions &&  data.versions.length === 0 && <NoneData></NoneData> }
           {
             data && data.versions_count > limit ?
               <div className="mt30 mb50 edu-txt-center">
diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss
index 9576503b..79a5a17a 100644
--- a/src/forge/Order/index.scss
+++ b/src/forge/Order/index.scss
@@ -7,9 +7,6 @@
 .attachment-list-div:hover {
   background-color: #e6f7ff;
 }
-.attachment-list-div:hover .attachment-list-delete {
-  display: block !important;
-}
 
 .searchBanner{
   display: flex;
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 3d00c4ac..36f69ba0 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -561,9 +561,6 @@ a.issue-type-button.active:hover {
 .paper-clip-color {
   color: #29bd8b !important;
 }
-.attachment-list-delete {
-  display: none;
-}
 .attachment-list-a {
   color: rgba(0, 0, 0, 0.65) !important;
 }
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 0203a26a..00b90ac2 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -549,7 +549,7 @@ class order extends Component {
           </ul>
           {this.renderNew()}
         </div>
-        <div className="topWrapper">
+        <div className="topWrapper" style={{borderBottom:"none"}}>
           <div className="target-detail-search">
             <Search
               placeholder="输入issue名称进行搜索"
diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx
index d3161835..780ac4e0 100644
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@@ -232,7 +232,6 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
     },
   ];
   return(
-    listData && listData.length>0 ? 
     <React.Fragment>
       <div className="baseForm" style={{display:'flex',justifyContent:"space-between",alignItems:"center"}}>
         <Dropdown overlay={roles} placement={"bottomCenter"}>
@@ -250,16 +249,15 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
       </div>
       <Spin spinning={isSpin}>
         <div className="collaboratorList baseForm">
-          { listData && listData.length>0 ?
+          { listData && listData.length>0 &&
             <Table
               pagination={false}
               columns={columns}
               dataSource={listData}
               rowKey={(record) => record.id}
             ></Table>
-          :
-            <NoneData _html="暂时还没有相关数据!" />
           }
+          { listData && listData.length === 0 && <NoneData _html="暂时还没有相关数据!" />}
         </div>
       </Spin>
       {total > LIMIT ?
@@ -274,8 +272,6 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
         </div>
       :""}
     </React.Fragment>
-    :
-    <NoneData _html="暂时还没有相关数据!" />
   )
 }
 export default CollaboratorMember;
\ No newline at end of file