From 9769bec51717f4afc616c8d2e66022e4caed64b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 15:31:48 +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

---
 .../courses/graduation/tasks/GraduationTasksedit.js      | 9 +++++++--
 public/react/src/modules/courses/new/CoursesNew.js       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 9874b26fa..cd84cd221 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -79,7 +79,12 @@ class GraduationTasksedit extends Component{
     let listid=[]
     let graduation_id=this.state.data.graduation_id;
     for(var list of fileList){
-      listid.push(list.response.id)
+    	if(list.response!=undefined){
+				listid.push(list.response.id)
+			}else{
+				listid.push(list.id)
+			}
+
     }
 
     // console.log(listid)
@@ -125,7 +130,7 @@ class GraduationTasksedit extends Component{
               GraduationTasksedittype=false;
               // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
               // this.goback()
-							window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting";
+              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
             }
           }).catch((error) => {
             console.log(error)
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index d8fb83974..6c0158f21 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -314,7 +314,7 @@ class CoursesNew extends Component {
             }
         }).then((result)=>{
             this.setState({
-                searchlistscholl:result.data.shools_name,
+                searchlistscholl:result.data.school_names,
                 scholl:value
             })
             this.props.form.setFieldsValue({