commit

src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java

@@ -5,15 +5,11 @@ import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.expression.ExpressionUtil;
 import com.budwk.app.flow.constant.FlowConst;
-import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.handlers.IHandler;
 import com.budwk.app.flow.engine.model.TaskModel;
-import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.CountersignTypeEnum;
-import org.nutz.lang.Lang;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -85,6 +81,13 @@ public class CountersignHandler implements IHandler {
         if (!isMerged && CountersignTypeEnum.PARALLEL.toString().equalsIgnoreCase(countersignType)) {
             // 是否所有会签任务已完成
             boolean finished = execution.getEngine().processTaskService().getDoingTaskList(execution.getProcessInstanceId(), new String[]{taskModel.getName()}).size() == 0;
+
+            if(StrUtil.isNotBlank(countersignCompletionCondition) && finished) {
+                execution.getEngine().processTaskService().rejectTask(execution.getProcessModel(), execution.getProcessTask());
+            } else {
+                isMerged = finished;
+            }
+
             if (!isMerged) {
                 // 未通过，更新已完成实例数量
                 Dict addVariable = Dict.create();
@@ -92,9 +95,6 @@ public class CountersignHandler implements IHandler {
                 addVariable.put(prefix + FlowConst.NR_OF_COMPLETED_AGREE_INSTANCES, execution.getArgs().get(prefix + FlowConst.NR_OF_COMPLETED_AGREE_INSTANCES));
                 execution.getEngine().processInstanceService().addVariable(execution.getProcessInstanceId(), addVariable);
             }
-            if(finished) {
-                execution.getEngine().processTaskService().rejectTask(execution.getProcessModel(), execution.getProcessTask());
-            }
         }
         if (isMerged) {
             // 获取所有会签参数键值