From 4cf5236fde3d9417c6dfd56c8b01e92c7aa9fd28 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Wed, 16 Feb 2022 10:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=9E=E8=B5=9Bissue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/expertUser/taskDetail/index.jsx    | 2 +-
 src/military/expert/reviewResult/gradesModal/index.jsx | 4 +++-
 src/military/expert/reviewResult/index.jsx             | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx
index 606bb52c..f48642ef 100644
--- a/src/military/expert/expertUser/taskDetail/index.jsx
+++ b/src/military/expert/expertUser/taskDetail/index.jsx
@@ -228,7 +228,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
             opsParentType: containerType,
             opsType: containerType,
             status: 2,
-            competitionTeamName: item.company_name
+            competitionTeamName: item.name
           });
         }
       }
diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx
index 53f0d2b5..91fbcfcf 100644
--- a/src/military/expert/reviewResult/gradesModal/index.jsx
+++ b/src/military/expert/reviewResult/gradesModal/index.jsx
@@ -145,7 +145,9 @@ function GradesModal({ setVisible, visible, taskId, opsDetail, containerType })
     >
       <div className="opsDetail">
         综合排名: {opsDetail && opsDetail.id}
-        <span className="ml30">应征者:&nbsp;&nbsp;</span> {opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)}
+        <span className="ml30">{containerType == 1 ? '应征者': '战队名称'}:&nbsp;&nbsp;</span>
+        {containerType == 1 && opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)}
+        {containerType == 2 && opsDetail && opsDetail.competitionTeamName}
         <span className="ml30">平均得分:&nbsp;&nbsp;</span> {opsDetail && opsDetail.finalGrades || `--`}
         <span className="ml30">是否胜出:&nbsp;&nbsp;</span> {opsDetail && opsDetail.isWin ? <div className="sucess df"><img src={sucess}/>胜出</div> : '未胜出'}
       </div>
diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx
index 94a5bc69..80f76c68 100644
--- a/src/military/expert/reviewResult/index.jsx
+++ b/src/military/expert/reviewResult/index.jsx
@@ -66,7 +66,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
       }
     });
   }else{
-    columns[1].title = "战队昵称";
+    columns[1].title = "战队名称";
   }
 
   useEffect(()=>{
@@ -206,7 +206,8 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
             scroll={{ y: 384 }}
           />
           <div className="openResult">
-            {status == 4 && <button className={(containerType ==1 && winIds && taskModeId == 1 && winIds.length >1) || result === null ? 'disableBut': 'but41_fill'} onClick={openResult}>公示结果</button>}
+            {/* 公示结果仅保留给创客使用 */}
+            {containerType == 1 && status == 4 && <button className={(containerType ==1 && winIds && taskModeId == 1 && winIds.length >1) || result === null ? 'disableBut': 'but41_fill'} onClick={openResult}>公示结果</button>}
           </div>
         </React.Fragment>:<div className="nodata font-20">暂无数据，此任务暂未进入{containerType ==1 ? '成果':'竞赛'}评选阶段。</div>}
         <Modal