From 7e0999d29a3c78f3ac2c3cf2097dbe42f254f42f Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 25 Aug 2025 14:16:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8D=8F=E5=8A=A9=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../json/ServiceTaskJsonConverter.java        |  2 +-
 .../converter/json/UserTaskJsonConverter.java |  2 +-
 .../src/main/resources/convertorXML.bpmn      | 67 ++++++++++---------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java
index 75168673d..240381940 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java
@@ -195,7 +195,7 @@ public class ServiceTaskJsonConverter extends AbstractBpmnJsonConverter<ServiceT
                                 cooperateShipTypeDescAttribute.setValue(property.getCooperateShipType().getDesc());
                                 cooperateShipType.addAttribute(cooperateShipTypeDescAttribute);
 
-                                approverSpecifyRangeRole.addChildElement(cooperateShipType);
+                                approverSpecifyElement.addChildElement(cooperateShipType);
                                 break;
                             case specified_org:
                                 checkCascadeConfig(property, "角色“审批单指定的末级组织”");
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java
index c504e1c18..34c385825 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java
@@ -400,7 +400,7 @@ public class UserTaskJsonConverter extends AbstractBpmnJsonConverter<UserTask> {
                                 cooperateShipTypeDescAttribute.setValue(property.getCooperateShipType().getDesc());
                                 cooperateShipType.addAttribute(cooperateShipTypeDescAttribute);
 
-                                approverSpecifyRangeRole.addChildElement(cooperateShipType);
+                                approverSpecifyElement.addChildElement(cooperateShipType);
                                 break;
                             case specified_org:
                                 checkCascadeConfig(property, "角色“审批单指定的末级组织”");
diff --git a/workflow-engine-server/src/main/resources/convertorXML.bpmn b/workflow-engine-server/src/main/resources/convertorXML.bpmn
index 913b6a525..611c936bb 100644
--- a/workflow-engine-server/src/main/resources/convertorXML.bpmn
+++ b/workflow-engine-server/src/main/resources/convertorXML.bpmn
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:flowable="http://flowable.org/bpmn"
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
              xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
              xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
              typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
@@ -88,7 +89,7 @@
         <jsonValue><![CDATA[{"id":"NODE_STARTER","type":"NODE_STARTER","name":"发起人","property":{"isMultiTask":true,"isSequential":false,"groupsType":"or","fieldPermission":[]}}]]></jsonValue>
       </extensionElements>
     </userTask>
-        <sequenceFlow id="SequenceFlowId_da7570d83a1e4b54a77897d217d56f5e" name="发起人" sourceRef="startEventNode"
+        <sequenceFlow id="SequenceFlowId_65659954c3054d05bd8d95f8a11cd3b1" name="发起人" sourceRef="startEventNode"
                       targetRef="NODE_STARTER"></sequenceFlow>
         <userTask id="node_864990574287_ylc5" name="审批节点" flowable:assignee="${assigneeName}"
                   flowable:formKey="test-form">
@@ -180,16 +181,16 @@
                 <completionCondition>${nrOfInstances != nrOfActiveInstances}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-        <sequenceFlow id="SequenceFlowId_4a034cacf63646bca79f5043d290640b" name="审批节点" sourceRef="NODE_STARTER"
+        <sequenceFlow id="SequenceFlowId_e1011c3d23e14b4da461ad51642a37a4" name="审批节点" sourceRef="NODE_STARTER"
                       targetRef="node_864990574287_ylc5"></sequenceFlow>
         <serviceTask id="node_865038288523_ff8k" name="抄送节点"
                      flowable:delegateExpression="${engineCarbonCopyV2EventListener}">
             <extensionElements>
                 <approverSpecify value="role_v2" desc="审批人指定">
-                    <approverSpecifyRange value="within_the_project_construction_units" desc="项目内参建单位的企业岗位">
-                        <approverSpecifyCooperateType value="PROJ_PRIMARY_CONTRACTING_UNIT"
-                                                      desc="施工总承包"></approverSpecifyCooperateType>
-                    </approverSpecifyRange>
+                    <approverSpecifyCooperateType value="PROJ_PRIMARY_CONTRACTING_UNIT"
+                                                  desc="施工总承包"></approverSpecifyCooperateType>
+                    <approverSpecifyRange value="within_the_project_construction_units"
+                                          desc="项目内参建单位的企业岗位"></approverSpecifyRange>
                     <specifyValue>
                         <![CDATA[[{"name":"其他","value":101357,"type":7},{"name":"首页-待删除","value":101289,"type":7},{"name":"班组管理（劳资）","value":101290,"type":7},{"name":"人员管理-T","value":101291,"type":7},{"name":"查看企业通讯录","value":101292,"type":7},{"name":"部门管理-T","value":101293,"type":7},{"name":"班组管理","value":101294,"type":7},{"name":"岗位权限管理-T","value":101295,"type":7},{"name":"编辑工程-待删除","value":101296,"type":7},{"name":"查看工程","value":101297,"type":7},{"name":"申请工程完结-待删除","value":101356,"type":7},{"name":"发薪账户管理","value":101298,"type":7},{"name":"查看发薪报表-T","value":101299,"type":7},{"name":"招工","value":101300,"type":7}]]]></specifyValue>
                 </approverSpecify>
@@ -199,7 +200,7 @@
                     <![CDATA[{"id":"node_865038288523_ff8k","parentId":"node_864990574287_ylc5","type":"NODE_CARBON_COPY","name":"抄送节点","property":{"approverSpecify":"role_v2","approverSpecifyRange":"within_the_project_construction_units","cooperateShipType":"PROJ_PRIMARY_CONTRACTING_UNIT","approverSpecifyRangeUnit":"in_ent","initiatorSpecifiedFilter":false,"excludeIdentityTypes":[],"excludeCooperateShipTypes":[],"specifyValue":"[{\"name\":\"其他\",\"value\":101357,\"type\":7},{\"name\":\"首页-待删除\",\"value\":101289,\"type\":7},{\"name\":\"班组管理（劳资）\",\"value\":101290,\"type\":7},{\"name\":\"人员管理-T\",\"value\":101291,\"type\":7},{\"name\":\"查看企业通讯录\",\"value\":101292,\"type\":7},{\"name\":\"部门管理-T\",\"value\":101293,\"type\":7},{\"name\":\"班组管理\",\"value\":101294,\"type\":7},{\"name\":\"岗位权限管理-T\",\"value\":101295,\"type\":7},{\"name\":\"编辑工程-待删除\",\"value\":101296,\"type\":7},{\"name\":\"查看工程\",\"value\":101297,\"type\":7},{\"name\":\"申请工程完结-待删除\",\"value\":101356,\"type\":7},{\"name\":\"发薪账户管理\",\"value\":101298,\"type\":7},{\"name\":\"查看发薪报表-T\",\"value\":101299,\"type\":7},{\"name\":\"招工\",\"value\":101300,\"type\":7}]","isMultiTask":true,"isSequential":false,"groupsType":"or","carbonCopyConf":[],"fieldPermission":[]}}]]></jsonValue>
             </extensionElements>
         </serviceTask>
-        <sequenceFlow id="SequenceFlowId_41662666dd364cd4842aa79374691393" name="抄送节点"
+        <sequenceFlow id="SequenceFlowId_dbd8edeff8d44b1a8e2ac97570610de9" name="抄送节点"
                       sourceRef="node_864990574287_ylc5" targetRef="node_865038288523_ff8k"></sequenceFlow>
         <userTask id="node_865016003134_707l" name="业务节点" flowable:assignee="${assigneeName}"
                   flowable:formKey="test-form">
@@ -292,9 +293,9 @@
                 <completionCondition>${nrOfInstances != nrOfActiveInstances}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-        <sequenceFlow id="SequenceFlowId_a0aae7b6a9b4426ea297f5fa218b69ad" name="业务节点"
+        <sequenceFlow id="SequenceFlowId_3b9c207d9bca4cadbce6aba2463319fa" name="业务节点"
                       sourceRef="node_865038288523_ff8k" targetRef="node_865016003134_707l"></sequenceFlow>
-        <sequenceFlow id="SequenceFlowId_7f00cd637523424098a2aad2d15776b0" sourceRef="node_865016003134_707l"
+        <sequenceFlow id="SequenceFlowId_2ed992f454044ef0bf3b3c43395a3e73" sourceRef="node_865016003134_707l"
                       targetRef="endEventNode"></sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_id">
@@ -317,40 +318,40 @@
       <bpmndi:BPMNShape bpmnElement="NODE_STARTER" id="BPMNShape_NODE_STARTER">
         <omgdc:Bounds height="60.0" width="100.0" x="80.0" y="0.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_41662666dd364cd4842aa79374691393"
-                         id="BPMNEdge_SequenceFlowId_41662666dd364cd4842aa79374691393">
-            <omgdi:waypoint x="330.0" y="30.0"></omgdi:waypoint>
-            <omgdi:waypoint x="342.0" y="30.0"></omgdi:waypoint>
-            <omgdi:waypoint x="342.0" y="30.000000000000007"></omgdi:waypoint>
-            <omgdi:waypoint x="380.0" y="30.000000000000007"></omgdi:waypoint>
+        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_3b9c207d9bca4cadbce6aba2463319fa"
+                         id="BPMNEdge_SequenceFlowId_3b9c207d9bca4cadbce6aba2463319fa">
+            <omgdi:waypoint x="480.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="492.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="492.0" y="30.000000000000007"></omgdi:waypoint>
+            <omgdi:waypoint x="530.0" y="30.000000000000007"></omgdi:waypoint>
         </bpmndi:BPMNEdge>
-        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_4a034cacf63646bca79f5043d290640b"
-                         id="BPMNEdge_SequenceFlowId_4a034cacf63646bca79f5043d290640b">
+        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_e1011c3d23e14b4da461ad51642a37a4"
+                         id="BPMNEdge_SequenceFlowId_e1011c3d23e14b4da461ad51642a37a4">
         <omgdi:waypoint x="180.0" y="30.0"></omgdi:waypoint>
         <omgdi:waypoint x="192.0" y="30.0"></omgdi:waypoint>
         <omgdi:waypoint x="192.0" y="30.000000000000007"></omgdi:waypoint>
         <omgdi:waypoint x="230.0" y="30.000000000000007"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_7f00cd637523424098a2aad2d15776b0"
-                         id="BPMNEdge_SequenceFlowId_7f00cd637523424098a2aad2d15776b0">
+        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_65659954c3054d05bd8d95f8a11cd3b1"
+                         id="BPMNEdge_SequenceFlowId_65659954c3054d05bd8d95f8a11cd3b1">
+            <omgdi:waypoint x="30.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="42.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="42.0" y="30.000000000000007"></omgdi:waypoint>
+            <omgdi:waypoint x="80.0" y="30.000000000000007"></omgdi:waypoint>
+        </bpmndi:BPMNEdge>
+        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_2ed992f454044ef0bf3b3c43395a3e73"
+                         id="BPMNEdge_SequenceFlowId_2ed992f454044ef0bf3b3c43395a3e73">
             <omgdi:waypoint x="630.0" y="30.0"></omgdi:waypoint>
             <omgdi:waypoint x="642.0" y="30.0"></omgdi:waypoint>
             <omgdi:waypoint x="642.0" y="30.000000000000004"></omgdi:waypoint>
             <omgdi:waypoint x="680.0" y="30.000000000000004"></omgdi:waypoint>
         </bpmndi:BPMNEdge>
-        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_a0aae7b6a9b4426ea297f5fa218b69ad"
-                         id="BPMNEdge_SequenceFlowId_a0aae7b6a9b4426ea297f5fa218b69ad">
-            <omgdi:waypoint x="480.0" y="30.0"></omgdi:waypoint>
-            <omgdi:waypoint x="492.0" y="30.0"></omgdi:waypoint>
-            <omgdi:waypoint x="492.0" y="30.000000000000007"></omgdi:waypoint>
-            <omgdi:waypoint x="530.0" y="30.000000000000007"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_da7570d83a1e4b54a77897d217d56f5e"
-                         id="BPMNEdge_SequenceFlowId_da7570d83a1e4b54a77897d217d56f5e">
-        <omgdi:waypoint x="30.0" y="30.0"></omgdi:waypoint>
-        <omgdi:waypoint x="42.0" y="30.0"></omgdi:waypoint>
-        <omgdi:waypoint x="42.0" y="30.000000000000007"></omgdi:waypoint>
-        <omgdi:waypoint x="80.0" y="30.000000000000007"></omgdi:waypoint>
+        <bpmndi:BPMNEdge bpmnElement="SequenceFlowId_dbd8edeff8d44b1a8e2ac97570610de9"
+                         id="BPMNEdge_SequenceFlowId_dbd8edeff8d44b1a8e2ac97570610de9">
+            <omgdi:waypoint x="330.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="342.0" y="30.0"></omgdi:waypoint>
+            <omgdi:waypoint x="342.0" y="30.000000000000007"></omgdi:waypoint>
+            <omgdi:waypoint x="380.0" y="30.000000000000007"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>