修正withdraw和reject动作实现

entropy-cloud · Nov 17, 2023 · be618a8 · be618a8
1 parent ae69e3a
commit be618a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/engine/WorkflowEngineImpl.java b/nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/engine/WorkflowEngineImpl.java
@@ -1202,7 +1202,7 @@ private boolean isForStatus(IWorkflowStepImplementor step, WfActionModel actionM
         } else if (status == NopWfCoreConstants.WF_STEP_STATUS_WAITING) {
             return actionModel.isForWaiting();
         } else if (step.isHistory()) {
-            return actionModel.isForHistory();
+            return actionModel.isForHistory() || actionModel.isForWithdraw();
         }
         // 所有其他状况都不允许
         return false;

diff --git a/nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/store/beans/WorkflowStepRecordBean.java b/nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/store/beans/WorkflowStepRecordBean.java
@@ -18,6 +18,7 @@
 import io.nop.wf.core.store.IWorkflowStepRecord;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 
 @DataBean
@@ -69,6 +70,10 @@ public WorkflowStepLinkBean addNextStepLink(String nextStepId) {
         link.setWfId(getWfId());
         link.setStepId(getStepId());
         link.setNextStepId(nextStepId);
+
+        if (nextStepLinks == null)
+            this.nextStepLinks = new ArrayList<>();
+        this.nextStepLinks.add(link);
         return link;
     }
 

diff --git a/nop-wf/nop-wf-core/src/test/java/io/nop/wf/core/engine/TestWorkflowEngine.java b/nop-wf/nop-wf-core/src/test/java/io/nop/wf/core/engine/TestWorkflowEngine.java
@@ -422,7 +422,6 @@ public void testReject() {
         assertNotNull(rejectAction);
 
         ysh.invokeAction("_rejectAction", null, context);
-        workflow.runAutoTransitions(context);
 
         List<? extends IWorkflowStep> activeSteps = workflow.getSteps(false);
         assertEquals(1, activeSteps.size());