被拒绝的流程不要回到重新开始

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -469,6 +469,16 @@ public class CostInfoController {
                 }
             }
         }
+        List<FlowTaskVo> flowTaskVoListRemove = new ArrayList<>(flowTaskVoListByQueryType);
+        for (FlowTaskVo vo : flowTaskVoListRemove) {
+            if (vo.getFlowTaskStatus().equals("2")) {
+                flowTaskVoListByQueryType.remove(vo);
+            }
+        }
+        //重新进行包装分页
+        if (flowTaskVoListByQueryType.size() < 1) {
+            return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByQueryType, Long.valueOf(flowTaskVoListByQueryType.size())));
+        }
         //项目名称筛选
         List<FlowTaskVo> flowTaskVoListByQueryTypePro = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(listRuntimeTaskRequestVo.getProjectName())) {

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/impl/FlowApiServiceImpl.java

@@ -571,6 +571,7 @@ public class FlowApiServiceImpl implements FlowApiService {
         if (StrUtil.isNotBlank(listRuntimeTaskRequestVo.getTaskName())) {
             query.taskNameLike("%" + listRuntimeTaskRequestVo.getTaskName() + "%");
         }
+
         this.buildCandidateCondition(query, username);
         long totalCount = query.count();
         query.orderByTaskCreateTime().desc();