diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 8fd31cd5c..20213c931 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -119,7 +119,7 @@ class Exercise extends Component{
 
     changeType=(e)=>{
         this.setState({
-            type:e.key,
+            type:e.key==="0"?undefined:e.key,
 					  page:1,
             checkAllValue:false,
             checkBoxValues:[]
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 0fbc3bc2f..58d6e37e5 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -24,6 +24,7 @@ class GraduationTasks extends Component{
       checkAllValue: false,
       checkBoxValues: [],
       all_count:undefined,
+			task_count:undefined,
       course_identity:undefined,
       course_public:undefined,
       tasks:[],
@@ -55,6 +56,7 @@ class GraduationTasks extends Component{
       if(response.status===200){
         this.setState({
           all_count:response.data.all_count,
+					task_count:response.data.task_count,
           course_public:response.data.course_public,
           tasks:response.data.tasks,
           unpublished_count:response.data.unpublished_count,
@@ -606,7 +608,8 @@ class GraduationTasks extends Component{
       Saves,
       course_groups,
       search,
-      order
+      order,
+			task_count
     } = this.state;
     //   this.fetchAll(search,page,order);
     const coursesId=this.props.match.params.coursesId;
@@ -772,13 +775,13 @@ class GraduationTasks extends Component{
         </Spin>
 
           {
-            all_count > 15 && 
+						task_count > 15 &&
             <div className="mb40 edu-txt-center padding20-30" >
               <Pagination
                 showQuickJumper
                 defaultCurrent={1}
                 pageSize={15}
-                total={all_count}
+                total={task_count}
                 current={page}
 
                 onChange={this.PaginationTask}