Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -294,18 +294,6 @@
        // 完成任务
        taskService.complete(taskId, variables);

//        //设置下一步审核人
//        Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).active().singleResult();//下一步节点
//        String taskKey = task.getTaskDefinitionKey();//就是流程配置的节点id
//        Object to = getVar(processInstanceId,taskKey);
//        if(to==null){
//            throw new ServiceException(taskKey+"没有设置审核人");
//        }
//        String assignee = to.toString();
//
//        if(StringUtils.isNotEmpty(assignee)) {
//            task.setAssignee(assignee);
//        }
        return true;
    }


 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java

@@ -199,17 +199,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);