From 36b2db25cf35821037a20c33fe834a3c6340919c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Sep 2019 10:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupjobbank/Groupjobquesanswer.js        | 44 ++++++++++++-------
 .../courses/questionbank/Generaljobanswer.js  |  4 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
index 1d58a7fae..f13b97cea 100644
--- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
+++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
@@ -64,28 +64,42 @@ class Groupjobquesanswer extends Component {
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
 					{
-						datas&&(datas.reference_answer===null?
-								<NoneData></NoneData>
+						datas.reference_answer===null?
+								""
 								:datas.reference_answer==="null"?
-									<NoneData></NoneData>
-									:
+									""									:
 									datas.reference_answer===""?
-										<NoneData></NoneData>
+										""
 										:
 										<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
-										// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
-						)
 					}
-					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
-					<div className="mt24">
-					{datas.attachments === undefined ? "" :
-						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
-					</div>
 
-					{/*<GroupPackage2 datas={datas} bool={true}></GroupPackage2>*/}
+					{datas.reference_attachments === undefined ?
+						(datas.reference_answer===undefined || datas.reference_answer===null?
+								<NoneData></NoneData>
+								:
+								""
+						)
+						:
+						datas.reference_attachments === null ?
+							(datas.reference_answer===undefined || datas.reference_answer===null?
+									<NoneData></NoneData>
+									:
+									""
+							)
+						:
+							datas.reference_attachments.length === 0 ?
+								(datas.reference_answer===undefined || datas.reference_answer===null?
+										<NoneData></NoneData>
+										:
+										""
+								)
+								:
+			     <div className="mt24">
+						<AttachmentsList {...this.state} {...this.props} attachments={datas.reference_attachments} ></AttachmentsList>
+					</div>
+					}
 				</div>
-
-
 			</div>
 
 		)
diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
index dec9da34e..9658fad55 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
@@ -77,8 +77,8 @@ class Generaljobanswer extends Component {
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.reference_answer===null?"无":datas.reference_answer==="null"?"无":datas.reference_answer)).replace(/▁/g, "▁▁▁")}}/>*/}
 					<div className="mt16px">
-					{datas.attachments === undefined ? "" :
-						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
+					{datas.reference_attachments === undefined ? "" :
+						<AttachmentsList {...this.state} {...this.props} attachments={datas.reference_attachments} ></AttachmentsList>}
 					</div>
 
 					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}