From 33f9005e2df9bd7f23c28dc4c23d6396a867ec25 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Wed, 19 Jan 2022 17:24:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=B8=93=E5=AE=B6?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=9C=A8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8D=E5=8F=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=AC=E7=A4=BA=E6=8C=89=E9=92=AE=EF=BC=8C=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E6=98=8E=E7=BB=86=E6=8C=89=E7=85=A7=E5=B9=B3=E5=9D=87?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/reviewResult/gradesModal/index.jsx | 2 +-
 src/military/task/taskDetail/index.jsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx
index e4078ab3..4f93e7b5 100644
--- a/src/military/expert/reviewResult/gradesModal/index.jsx
+++ b/src/military/expert/reviewResult/gradesModal/index.jsx
@@ -109,7 +109,7 @@ function GradesModal({ setVisible, visible, taskId, opsDetail }) {
     let params = {
       opsId: opsDetail && opsDetail.opsId,
       opsType: opsDetail && opsDetail.opsType,
-      orderBy: '',
+      orderBy: 'gradesAverageDesc',
       containerId: taskId,
       containerType: 1,
     };
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index 25e838d6..b390dff5 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -483,7 +483,7 @@ export default Form.create()(
             {detailData.status === 4 && dataList.length && (!detailData.isProofBoolean) && (!detailData.expertReview) && detailData.user && (current_user.admin || current_user.login === detailData.user.login) ?
               <a className="line_1 color-blue fr ml20" onClick={() => { setVisibleProofs(true) }}>上传佐证材料</a> : ''}
             {dataList.length > 0 && taskLimit && <a className="line_1 color-blue fr ml20" onClick={() => { window.open(`${httpUrl}/api/paper/papers/download/${id}`) }}>一键导出成果物 &gt;&gt;</a>}
-            {(!detailData.showUserStatus) && taskLimit && <a className="fr color-orange ml20" onClick={showUser}>应征者名单公示 &gt;&gt;</a>}
+            {(!detailData.showUserStatus) && !detailData.expertReview && taskLimit && <a className="fr color-orange ml20" onClick={showUser}>应征者名单公示 &gt;&gt;</a>}
             {/* [添加专家评审流程]按钮入口，仅管理员可见 */}
             {taskLimit && !detailData.expertReview && detailData.status<4 && <a className="fr color-orange ml20" onClick={addExpertReviewModal}>添加专家评审流程</a>}
           </div>

From c8fd59d10197456f63ad2bab55e027eb741611f1 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Wed, 19 Jan 2022 17:27:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/reviewRules/index.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/military/expert/reviewRules/index.jsx b/src/military/expert/reviewRules/index.jsx
index 040355cd..0ea1f4fa 100644
--- a/src/military/expert/reviewRules/index.jsx
+++ b/src/military/expert/reviewRules/index.jsx
@@ -114,7 +114,7 @@ function ReviewRules({form, history, match}) {
           {getFieldDecorator('criteriaOne', {
             rules: [{ required: true, message: '请输入一个评分标准' }],
           })(
-            <WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
+            <WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
           )}
         </Form.Item>
         <Form.Item
@@ -123,7 +123,7 @@ function ReviewRules({form, history, match}) {
           {getFieldDecorator('criteriaTwo', {
             rules: [{}],
           })(
-            <WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100' />,
+            <WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100' />,
           )}
         </Form.Item>
         <Form.Item
@@ -132,7 +132,7 @@ function ReviewRules({form, history, match}) {
           {getFieldDecorator('criteriaThree', {
             rules: [{}],
           })(
-            <WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
+            <WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
           )}
         </Form.Item>
         <Form.Item
@@ -141,7 +141,7 @@ function ReviewRules({form, history, match}) {
           {getFieldDecorator('criteriaFour', {
             rules: [{}],
           })(
-            <WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
+            <WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
           )}
         </Form.Item>
         <Form.Item
@@ -150,7 +150,7 @@ function ReviewRules({form, history, match}) {
           {getFieldDecorator('criteriaFive', {
             rules: [{}],
           })(
-            <WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
+            <WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
           )}
         </Form.Item>
         <p className="rules_bar"></p>