Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -410,10 +410,15 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         for (Element userTask : userTasks) {
             Attribute assignee = userTask.attribute("assignee");
             if (assignee == null) {
-                userTask.addAttribute("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");
         if (processId == null) {
             workflowModelDto.setJson_xml(rootElement.asXML());
@@ -436,13 +441,17 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
 
         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) {