ludc
2023-11-20 5e449c8bba2273313fd25457cae653a0f340c910
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
@@ -39,7 +39,6 @@
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -199,17 +198,21 @@
               flowTaskUserCi.setToTaskName(targetFlow.getName());
               taskList.add(flowTaskUserCi);
            }
            // 如果下个审批节点为排他网关
            if (targetFlow instanceof ExclusiveGateway) {
            // 如果下个审批节点为网关
            if (targetFlow instanceof Gateway) {
               ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow;
               List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows();
               for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){
                  String conditionExpression = nexti.getConditionExpression();//condition
                  String taskId = nexti.getTargetRef();//taskId
                  String name = nexti.getName();//toName,驳回、同意
                  String taskName = taskMap.get(targetFlow.getId());
                  String taskName = taskMap.get(taskId);
//ExclusiveGateway
                  if(StringUtils.isEmpty(conditionExpression)){//此时排他网关没有配置流转条件
                     continue;
                  }
                  for (FlowTaskDTO flowTaskUserCi:mis){
                     if(taskId.equals(flowTaskUserCi.getTaskId())){
                        flowTaskUserCi.setCondition(conditionExpression);