撤回审批

platform-dao/src/main/java/com/platform/dao/enums/TaskRecordStatusEnum.java

@@ -35,7 +35,7 @@ public enum TaskRecordStatusEnum {
     /**
      * 撤回
      */
-    CANCEL(5),
+    CANCEL(6),
     ;
     private final Integer value;
 

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowTaskBomServiceImpl.java

@@ -125,9 +125,9 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
             throw new DeniedException("待办事项状态有误，请检查");
         }
         int taskStatus = task.getStatus();
-        if (taskStatus != FlowTaskStatusEnum.APPLY.getValue() ||
+        if (taskStatus != FlowTaskStatusEnum.APPLY.getValue() &&
                 taskStatus != FlowTaskStatusEnum.BACK.getValue()
-                || taskStatus != FlowTaskStatusEnum.CANCEL.getValue()) {
+                && taskStatus != FlowTaskStatusEnum.CANCEL.getValue()) {
             throw new DeniedException("待办事项任务状态有误，请检查");
         }
         // 生成新的taskBom