Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -741,9 +741,9 @@ class GraduationTaskssettinglist extends Component{
 			render: (text, record) => (
 				<span>
 			 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":	<pre>
-								{record.finalscore.final_score.username}{(record.finalscore.final_score.login)}<br/>
+								{record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/>
 							  {record.finalscore.ultimate_score===true?"":"教师评分："+record.finalscore.teacher_comment_score+"分"}<br/>
-				        {taskslistdata.cross_comment===true?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
+				        {record.finalscore.cross_comment_score===undefined?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
 				        {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"+<br/>}
 							  最终成绩：{record.finalscore.work_score}分<br/>
 							</pre>}>