|
@@ -73,9 +73,14 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
|
|
values.put("initiatorName", SecurityContextUtil.getNickName());
|
|
values.put("initiatorName", SecurityContextUtil.getNickName());
|
|
values.put("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true);
|
|
values.put("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true);
|
|
values.put("_SKIP_INITIATOR", true);
|
|
values.put("_SKIP_INITIATOR", true);
|
|
|
|
+ List<StartNode> startNodes = flowDefine.findFlowNodesOfType(StartNode.class);
|
|
|
|
+ for (StartNode startNode : startNodes) {
|
|
|
|
+ values.remove(String.format("_%s_", startNode.getId()));
|
|
|
|
+ }
|
|
List<ApprovalNode> approvalNodes = flowDefine.findFlowNodesOfType(ApprovalNode.class);
|
|
List<ApprovalNode> approvalNodes = flowDefine.findFlowNodesOfType(ApprovalNode.class);
|
|
for (ApprovalNode approvalNode : approvalNodes) {
|
|
for (ApprovalNode approvalNode : approvalNodes) {
|
|
values.put(String.format("%sCollection", approvalNode.getId()), approvalNode.getAssignees(values, flowDefine));
|
|
values.put(String.format("%sCollection", approvalNode.getId()), approvalNode.getAssignees(values, flowDefine));
|
|
|
|
+ values.remove(String.format("_%s_", approvalNode.getId()));
|
|
}
|
|
}
|
|
List<CcNode> ccNodes = flowDefine.findFlowNodesOfType(CcNode.class);
|
|
List<CcNode> ccNodes = flowDefine.findFlowNodesOfType(CcNode.class);
|
|
for (CcNode ccNode : ccNodes) {
|
|
for (CcNode ccNode : ccNodes) {
|
|
@@ -134,7 +139,8 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
|
|
.start();
|
|
.start();
|
|
try {
|
|
try {
|
|
runtimeService.setVariable(instanceId, "_SKIP_INITIATOR", false);
|
|
runtimeService.setVariable(instanceId, "_SKIP_INITIATOR", false);
|
|
- } catch (Exception ignored) {}
|
|
|
|
|
|
+ } catch (Exception ignored) {
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|