فهرست منبع

Merge pull request '兼容任务触发器情况' (#7) from insist-dev2024 into master

Reviewed-on: https://git.aizuda.com/aizuda/aizuda-boot/pulls/7
aizuda 1 سال پیش
والد
کامیت
6220eac740

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/flow/FlowForm.java

@@ -19,7 +19,7 @@ public class FlowForm {
     }
 
     public static Map<String, Object> flowArgs(Map<String, Object> args) {
-        Map<String, Object> formArgs = FlowDataTransfer.get("flowFormArgs");
+        Map<String, Object> formArgs = FlowDataTransfer.get("flowFormArgs") == null ? new HashMap<>():FlowDataTransfer.get("flowFormArgs");
         if (MapUtils.isNotEmpty(args)) {
             formArgs.putAll(args);
         }

+ 6 - 0
src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskListener.java

@@ -28,6 +28,12 @@ public class FlowTaskListener implements TaskListener {
     @Override
     public boolean notify(EventType eventType, Supplier<FlwTask> supplier, NodeModel nodeModel, FlowCreator flowCreator) {
         FlwTask flwTask = supplier.get();
+
+        // 延迟触发器
+        if (EventType.autoComplete.eq(eventType) && TaskType.trigger.eq(flwTask.getTaskType())) {
+            return true;
+        }
+
         // 不进行二次执行自动跳转逻辑,防止出现taskId不存在,退回需要发起人手动审批
         if (EventType.create.eq(eventType)) {
             // 获取当前节点信息