From 162fd200a560dc6b836e1f301b855f8ee0c82e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 11 Nov 2021 10:40:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=91=E5=B8=83=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/components/agreementModal/index.jsx         |  2 +-
 src/military/task/taskEdit/index.jsx                 | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/military/task/components/agreementModal/index.jsx b/src/military/task/components/agreementModal/index.jsx
index 21d17c6c..294df42f 100644
--- a/src/military/task/components/agreementModal/index.jsx
+++ b/src/military/task/components/agreementModal/index.jsx
@@ -55,7 +55,7 @@ export default Form.create()(props => {
       <div className="task-popup-content">
         {/* paperAuditing */}
         {checkedItem.paperAuditing && <p className=" mb10 color-orange task_tip">审核意见：{checkedItem.paperAuditing.message}</p>}
-        <a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32">协议样板.word</a>
+        <a href="https://task.osredm.com/busiAttachments/download/121" className="icon icon-attachment font-13 color-blue" length="32">协议样板.word</a>
         <Form.Item className="upload-form" label="附件上传" required={true}>
           <Upload
             load={uploadFunc}
diff --git a/src/military/task/taskEdit/index.jsx b/src/military/task/taskEdit/index.jsx
index 3501a6e8..e21b17ad 100644
--- a/src/military/task/taskEdit/index.jsx
+++ b/src/military/task/taskEdit/index.jsx
@@ -197,8 +197,10 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
     if (res && res.data) {
       showNotification("任务保存成功！");
       if (!status) {
-        history.push("/task/myTask?published=false")
-      } else  {
+        history.push("/task/myTask?published=false");
+      } else if (current_user.admin) {
+        history.push("/task");
+      } else {
         info({
           title: '提示',
           content: <div>
@@ -305,9 +307,9 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
 
         <div className="padding30 bor-bottom-greyE">
           <p className="partTitle">任务内容<span className="color-red font-14">（*必填）</span>
-            <span>
-              <a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">创客任务列表_2019-07-26_20-53.xlsx</a>
-            </span><span className="color-grey-9 ml5 font-12 ">点击下载示例模版</span>
+            {/* <span>
+              <a href="https://task.osredm.com/busiAttachments/download/121" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">创客任务模版.xlsx</a>
+            </span><span className="color-grey-9 ml5 font-12 ">点击下载示例模版</span> */}
           </p>
 
           <div className="pl15 task-edit-content">

From b423e4b7e756769c82162e30154a4b38b93cbf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Mon, 22 Nov 2021 14:58:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/notice/noticeList/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx
index fd7124f5..256353ba 100644
--- a/src/military/notice/noticeList/index.jsx
+++ b/src/military/notice/noticeList/index.jsx
@@ -217,7 +217,7 @@ export default (props) => {
             showTotal={total => `共 ${total} 条`}
           />
         </div>} */}
-        {noticeList.length > 0 ? noticeList.length === 10 && <div className="edu-txt-center mt30 mb30">
+        {total > 0 ? total> 10 ? <div className="edu-txt-center mt30 mb30">
           <Pagination
             showQuickJumper
             onChange={(page) => { setCurPage(page) }}
@@ -225,7 +225,7 @@ export default (props) => {
             total={total}
             showTotal={total => `共 ${total} 条`}
           />
-        </div> : <Nodata _html="暂无数据" />}
+        </div> : "" : <Nodata _html="暂无数据" />}
       </React.Fragment>
     }
   }