diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx
index 292e5dc9..5b4ef5d1 100644
--- a/src/military/notice/noticeList/index.jsx
+++ b/src/military/notice/noticeList/index.jsx
@@ -151,27 +151,32 @@ export default (props) => {
         </div>
         {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
       </div>
-      <ItemList
+      {param.length>0?<ItemList
         list={param}
         itemClick={noticeClick}
-      />
+      />:<Nodata _html="暂无数据" />}
+      {/* <ItemList
+        list={param}
+        itemClick={noticeClick}
+      /> */}
     </React.Fragment>
   }
 
   function content() {
     if (tab === '0') {
       return <React.Fragment>
-        {callList.length <= 0 && changeList.length <= 0 && checkList.length <= 0 && abandonList.length <= 0 ? <Nodata _html="暂无数据" /> : ""}
-        {callList.length > 0 && cont(callList, "招标公告", '4',"iconfont icon-zhaobiaogonggao")}
-        {changeList.length > 0 && cont(changeList, "更正公告", '1',"iconfont icon-gengzhenggonggao")}
-        {checkList.length > 0 && cont(checkList, "中标公告", '2',"iconfont icon-zhongbiaogonggao")}
-        {abandonList.length > 0 && cont(abandonList, "废标公告", '3',"iconfont icon-feibiaogonggao")}
+        {/* {callList.length <= 0 && changeList.length <= 0 && checkList.length <= 0 && abandonList.length <= 0 ? <Nodata _html="暂无数据" /> : ""} */}
+        {cont(callList, "招标公告", '4',"iconfont icon-zhaobiaogonggao")}
+        {cont(changeList, "更正公告", '1',"iconfont icon-gengzhenggonggao")}
+        {cont(checkList, "中标公告", '2',"iconfont icon-zhongbiaogonggao")}
+        {cont(abandonList, "废标公告", '3',"iconfont icon-feibiaogonggao")}
       </React.Fragment>
     } else if (tab === '7') {
       return <React.Fragment>
-        {technologyList.length <= 0 && dealList.length <= 0 ? <Nodata _html="暂无数据" /> : ""}
-        {technologyList.length > 0 && cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")}
-        {dealList.length > 0 && cont(dealList, "成交公告", '6',"iconfont icon-chengjiaogonggao")}
+        {/* {technologyList.length <= 0 && dealList.length <= 0 ? <Nodata _html="暂无数据" /> : ""} */}
+        {/* {technologyList.length > 0 && cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")} */}
+        {cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")}
+        {cont(dealList, "成交公告", '6',"iconfont icon-chengjiaogonggao")}
       </React.Fragment>
     } else if (tab === '8') {
       return <div></div>
@@ -214,7 +219,7 @@ export default (props) => {
           list={noticeList}
           itemClick={noticeClick}
         />
-        {noticeList.length === 10 && <div className="edu-txt-center mt30 mb30">
+        {/* {noticeList.length === 10 && <div className="edu-txt-center mt30 mb30">
           <Pagination
             showQuickJumper
             onChange={(page) => { setCurPage(page) }}
@@ -222,7 +227,16 @@ export default (props) => {
             total={total}
             showTotal={total => `共 ${total} 条`}
           />
-        </div>}
+        </div>} */}
+        {noticeList.length > 0 ? noticeList.length === 10 &&<div className="edu-txt-center mt30 mb30">
+          <Pagination
+            showQuickJumper
+            onChange={(page) => { setCurPage(page) }}
+            current={curPage}
+            total={total}
+            showTotal={total => `共 ${total} 条`}
+          />
+        </div> : <Nodata _html="暂无数据" />}
       </React.Fragment>
     }
   }
diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss
index 2c81b4cd..d0c88901 100644
--- a/src/military/notice/noticeList/index.scss
+++ b/src/military/notice/noticeList/index.scss
@@ -117,6 +117,10 @@ body{
   }
 }
 
+// #menu-selected>div>.itemClass>.iconfont{
+//   color: #fff;
+// }
+
 #menu-selected>.itemClass>.iconfont{
   color: #fff;
 }
@@ -146,4 +150,9 @@ body{
     margin-right:.75em;
     color: #1890FF;
   }
+}
+
+.ant-menu-vertical .ant-menu-item, .ant-menu-vertical-left .ant-menu-item, .ant-menu-vertical-right .ant-menu-item, .ant-menu-inline .ant-menu-item, .ant-menu-vertical .ant-menu-submenu-title, .ant-menu-vertical-left .ant-menu-submenu-title, .ant-menu-vertical-right .ant-menu-submenu-title, .ant-menu-inline .ant-menu-submenu-title{
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
\ No newline at end of file