任务pagebug

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileTaskController.java

@@ -252,9 +252,8 @@ public class ArchiveFileTaskController extends BladeController {
                 }
 
             } else if (dto.getSelectedType().equals(2)) { //已办页面
-                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
-                //当前自己的任务必须是已审批，才视为已办
-                params.add(2);
+                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status in(2,3) AND u_task_parallel.task_user = ?)");
+                //当前自己的任务必须是已审批、已废除 status = 2,3 ，才视为已办
                 params.add(SecureUtil.getUserId());
 
             } else if (dto.getSelectedType().equals(3)) { //我发起页面

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1267,9 +1267,8 @@ public class TaskController extends BladeController {
                 }
 
             } else if (dto.getSelectedType().equals(2)) { //已办页面
-                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
-                //当前自己的任务必须是已审批，才视为已办
-                params.add(2);
+                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status in(2,3) AND u_task_parallel.task_user = ?)");
+                //当前自己的任务必须是已审批、已废除 status = 2,3 ，才视为已办
                 params.add(SecureUtil.getUserId());
 
             } else if (dto.getSelectedType().equals(3)) { //我发起页面