From b4e634db56a86d406b5409c5502b81344f762543 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 26 八月 2021 16:19:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 0629d77..98fc1ad 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
@@ -410,8 +410,13 @@
         for (Element userTask : userTasks) {
             Attribute assignee = userTask.attribute("assignee");
             if (assignee == null) {
-                userTask.addAttribute("camunda:assignee", "${nextUserId}");
+                userTask.addAttribute("activiti:assignee", "${nextUserId}");
             }
+        }
+
+        Attribute activiti = rootElement.attribute("activiti");
+        if (activiti == null) {
+            rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
         }
 
         Attribute processId = process.attribute("id");
@@ -436,13 +441,17 @@
 
         Element rootElement = doc.getRootElement();
         Element process = rootElement.element("process");
-        List<Element> userTasks = process.elements("userTask1");
+        List<Element> userTasks = process.elements("userTask");
         for (Element userTask : userTasks) {
             Attribute assignee = userTask.attribute("assignee");
             if (assignee == null) {
-                userTask.addAttribute("camunda:assignee", "${createUserId}");
+                userTask.addAttribute("activiti:assignee", "${createUserId}");
             }
         }
+        Attribute activiti = rootElement.attribute("activiti");
+        if (activiti == null) {
+            rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
+        }
 
         Attribute processId = process.attribute("id");
         if (processId == null) {

--
Gitblit v1.8.0