冲突

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

@@ -1721,14 +1721,6 @@ public class TaskController extends BladeController {
                     emptyPage.setTotal(0);
                     emptyPage.setRecords(Collections.emptyList());
                     return R.data(emptyPage);
-                } else {
-                    // 待办页未选状态：默认查待审批
-                    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 = ?)");
-                    // 待办页选非待审批状态：直接返回空分页
-                    IPage<BusinessTaskPageVO> emptyPage = new Page<>(dto.getCurrent(), dto.getSize());
-                    emptyPage.setTotal(0);
-                    emptyPage.setRecords(Collections.emptyList());
-                    return R.data(emptyPage);
                 } else {
                     // 待办页未选状态：默认查待审批
                     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 = ? AND u_task_parallel.e_visa_content!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");