Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/Resource/index.js

@@ -757,6 +757,7 @@ class Fileslists extends Component{
               setupdate={(id)=>this.seactall(id)}
               Cancel={this.Cancelvisible}
               has_course_groups={this.state.has_course_groups}
+							attachmentId={this.state.coursesecondcategoryid}
           />:""}
 
             <Titlesearchsection

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

@@ -220,12 +220,13 @@ class Selectsetting extends Component{
 
 
 		let coursesId=this.props.match.params.coursesId;
-		let attachmentId=this.props.match.params.attachmentId;
+		let attachmentId=this.props.attachmentId;
 	  let url="/files/"+this.props.discussMessageid+".json";
 		//
 		axios.put(url,{
 			course_id:coursesId,
 			new_attachment_id:newfileList.length===0?undefined:newfileList,
+			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
 			is_public:is_public,
 			is_unified_setting:unified_setting,
 			publish_time:unified_setting===true?datatime===undefined?moment(new Date()).format('YYYY-MM-DD HH'):datatime:undefined,