From e1125af142cbe829fc9480161f02d2256cc58359 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 8 Nov 2023 09:19:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/bpmn/标准法规入库_变更流程.bpmn    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn
index 51cb37a5..5189e056 100644
--- a/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn
+++ b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-  <bpmn:process id="fb-entry-change" isExecutable="true">
+  <bpmn:process id="fb-entry-change" name="标准法规入库_变更流程" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0p6jmej</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:userTask id="Activity_16zkjpn" name="填写法规信息" activiti:assignee="${engineer}">
       <bpmn:incoming>Flow_0p6jmej</bpmn:incoming>
+      <bpmn:incoming>Flow_0xggagf</bpmn:incoming>
       <bpmn:outgoing>Flow_0m512as</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0p6jmej" sourceRef="StartEvent_1" targetRef="Activity_16zkjpn" />
     <bpmn:userTask id="Activity_084um6e" name="审批" activiti:assignee="${leader}">
       <bpmn:incoming>Flow_0m512as</bpmn:incoming>
-      <bpmn:incoming>Flow_0xggagf</bpmn:incoming>
       <bpmn:outgoing>Flow_1h4a3b6</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0m512as" sourceRef="Activity_16zkjpn" targetRef="Activity_084um6e" />
@@ -27,12 +27,12 @@
     <bpmn:sequenceFlow id="Flow_1xbzk8b" name="通过" sourceRef="Gateway_0fuuuxl" targetRef="Event_1j733yj">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_0xggagf" name="驳回" sourceRef="Gateway_0fuuuxl" targetRef="Activity_084um6e">
+    <bpmn:sequenceFlow id="Flow_0xggagf" name="驳回" sourceRef="Gateway_0fuuuxl" targetRef="Activity_16zkjpn">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_0si2qto">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="fb-entry-change">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -74,11 +74,11 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0xggagf_di" bpmnElement="Flow_0xggagf">
         <di:waypoint x="620" y="152" />
-        <di:waypoint x="620" y="100" />
-        <di:waypoint x="480" y="100" />
-        <di:waypoint x="480" y="137" />
+        <di:waypoint x="620" y="90" />
+        <di:waypoint x="320" y="90" />
+        <di:waypoint x="320" y="137" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="540" y="82" width="21" height="14" />
+          <dc:Bounds x="462" y="72" width="21" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>