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

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

@@ -73,14 +73,14 @@ class GraduationTaskssettinglist extends Component{
 		//get 数组
 		axios.get(url,{
 			params: {
-				teacher_comment:teacher_comment,
-				task_status:task_status,
-				course_group:course_group,
-				cross_comment:cross_comment,
-				order:order,
-				b_order:b_order,
-				search:search,
-				page:pages,
+				teacher_comment:teacher_comment===null?undefined:teacher_comment,
+				task_status:task_status===null?undefined:task_status,
+				course_group:course_group===null?undefined:course_group,
+				cross_comment:cross_comment===null?undefined:cross_comment,
+				order:order===null?undefined:order,
+				b_order:b_order===null?undefined:b_order,
+				search:search===null?undefined:search,
+				page:pages===null?undefined:pages,
 				limit:20,
 			},
 			paramsSerializer: function(params) {
@@ -148,7 +148,12 @@ class GraduationTaskssettinglist extends Component{
 			loadingstate:true
 		})
 
-		this.seacthdata(list.length===key?undefined:list, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
+		if(list.length===key){
+
+		}else{
+			this.seacthdata(list, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
+
+		}
 
 	}