From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index 98fc1ad..9b0bc11 100755
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -164,9 +164,6 @@
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
- String encoded = Base64Convert.byteToBase64(bpmnBytes);
- byte[] decoded = Base64Convert.base64ToByte(encoded);
- String xml = new String(decoded);
String processName = modelData.getName() + ".bpmn20.xml";
ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())
@@ -359,7 +356,9 @@
model.setName(oaWorkflowDtos.get(0).getFlowName());
model.setKey("java110_" + oaWorkflowDtos.get(0).getFlowId());
repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
+ String jsonXml = workflowModelDto.getJson_xml();
+ jsonXml = jsonXml.replaceAll("camunda:assignee", "activiti:assignee");
+ repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
TranscoderInput input = new TranscoderInput(svgStream);
@@ -410,7 +409,7 @@
for (Element userTask : userTasks) {
Attribute assignee = userTask.attribute("assignee");
if (assignee == null) {
- userTask.addAttribute("activiti:assignee", "${nextUserId}");
+ userTask.addAttribute("camunda:assignee", "${nextUserId}");
}
}
@@ -427,6 +426,8 @@
String processIdValue = processId.getValue();
String newXml = rootElement.asXML();
newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
workflowModelDto.setJson_xml(newXml);
}
--
Gitblit v1.8.0