Merge branch 'dev_aliyun' into dev_tj

merge aliyun

public/react/src/modules/courses/busyWork/CommonWorkPost.js

@@ -138,13 +138,14 @@ class CommonWorkPost extends Component{
       let {fileList,selectmemberslist,workslist, memberNumMin, memberNumMax}=this.state;
 
       let  userids=[];
+      if(selectmemberslist!=undefined&&selectmemberslist.length>0) {
+        for (var list of selectmemberslist) {
 
-      for(var list of selectmemberslist){
+          if (list.user_id != undefined && list.user_id != null) {
+            userids.push(list.user_id)
+          }
 
-        if(list.user_id!=undefined&&list.user_id!=null){
-          userids.push(list.user_id)
         }
-
       }
       const isGroup = this.props.isGroup()
       if(!isGroup){
@@ -152,11 +153,11 @@ class CommonWorkPost extends Component{
       }
 
       let listid=[];
-
+      if(fileList!=undefined&&fileList.length>0) {
-      for(var list of fileList){
+        for (var list of fileList) {
-        listid.push(list.id || list.response.id)
+          listid.push(list.id || list.response.id)
+        }
       }
-
       e.preventDefault();
       if( true ){
         this.props.form.validateFields((err, values) => {

public/react/src/modules/courses/coursesPublic/AccessoryModal.js

@@ -125,10 +125,11 @@ class AccessoryModal extends Component{
         let {fileList,description} =this.state;
 
         let newfileList=[];
-        for(var list of fileList){
+      if(fileList!=undefined&&fileList.length>0) {
+        for (var list of fileList) {
           newfileList.push(list.response.id)
         }
-
+      }
         if (newfileList.length == 0) {
           // this.props.showNotification('请先上传附件')
           if(this.props.modalname === "补交附件"){
@@ -194,8 +195,10 @@ class AccessoryModal extends Component{
     let {fileList,description} =this.state;
 
     let newfileList=[];
-    for(var list of fileList){
+    if(fileList!=undefined&&fileList.length>0) {
-      newfileList.push(list.response.id)
+      for (var list of fileList) {
+        newfileList.push(list.response.id)
+      }
     }
     let url= this.props.reviseAttachmentUrl || "/graduation_works/"+id+"/revise_attachment.json"
     axios.post(url,{

public/react/src/modules/courses/coursesPublic/AccessoryModal2.js

@@ -127,8 +127,10 @@ class AccessoryModal2 extends Component{
   	// debugger
     let {fileList,description} =this.state;
     let newfileList=[];
-    for(var list of fileList){
+    if(fileList!=undefined&&fileList.length>0) {
-      newfileList.push(list.response.id)
+      for (var list of fileList) {
+        newfileList.push(list.response.id)
+      }
     }
     this.props.Saves && this.props.Saves(newfileList, description)
     return;

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -106,12 +106,14 @@ class Selectsetting extends Component{
 
 	savecouseShixunModal=()=>{
 		let {fileList,is_public,description,datatime,Radiovalue}=this.state;
-
 		let newfileList=[];
-		for(var list of fileList){
+		if(fileList!=undefined&&fileList.length>0){
-			newfileList.push(list.response.id)
+			fileList.map((list,key)=>{
+				newfileList.push(list.response.id)
+			})
 		}
 
+
 		if(this.state.Radiovalue===1){
 			if(datatime===undefined||datatime===null||datatime=== ""){
 				this.setState({

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -130,10 +130,14 @@ class Sendresource extends Component{
 		let {fileList,description,is_public,datatime,Radiovalue} =this.state;
 
 		let newfileList=[];
-		for(var list of fileList){
+
-			newfileList.push(list.response.id)
+		if(fileList!=undefined&&fileList.length>0){
+			fileList.map((list,key)=>{
+				newfileList.push(list.response.id)
+			})
 		}
 
+
 		if(newfileList.length===0){
 			this.setState({
 				newfileListtype:true

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

@@ -205,13 +205,15 @@ class GraduationTasksedit extends Component{
   Commoninterface=(fileList)=>{
     let listid=[]
     let graduation_id=this.state.data.graduation_id;
-    for(var list of fileList){
+    if(fileList!=undefined&&fileList.length>0) {
-      if(list.response!=undefined){
+      for (var list of fileList) {
-        listid.push(list.response.id)
+        if (list.response != undefined) {
-      }else{
+          listid.push(list.response.id)
-        listid.push(list.uid)
+        } else {
-      }
+          listid.push(list.uid)
+        }
 
+      }
     }
 
     // console.log(listid)

public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

@@ -35,10 +35,11 @@ class CreateGroupByImportModal extends Component{
         return;
     }
     let newfileList=[];
-    for(var list of fileList){
+    if(fileList!=undefined&&fileList.length>0) {
+      for (var list of fileList) {
         newfileList.push(list.response.id)
+      }
     }
-
     axios.post(url, {
         attachment_ids: newfileList
     })