From 070d6aca3fd91ae7eb297c36c62a4320f43043a1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 23 八月 2025 12:11:27 +0800
Subject: [PATCH] 首页搜索bug修复
---
blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
index d3ec1df..e8891e2 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
@@ -41,15 +41,27 @@
<sequenceFlow id="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1" sourceRef="confirmIsUseableTask" targetRef="check" name="鍥哄寲绋嬪簭鍙敤">
<conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb" sourceRef="approveTask" targetRef="check">
+ <sequenceFlow id="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb" sourceRef="approveTask" targetRef="programmingTask">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="confirmIsUseableTask" targetRef="programmingTask">
+ <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="confirmIsUseableTask" targetRef="programmingTask" name="涓嶅彲鐢�">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
<endEvent id="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf" name="缁勯暱缁撴潫"/>
- <sequenceFlow id="sid-1ef405f8-c119-4225-b41c-fb0aa978e42c" sourceRef="teamLeaderTask" targetRef="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf">
+ <sequenceFlow id="sid-1ef405f8-c119-4225-b41c-fb0aa978e42c" sourceRef="teamLeaderTask" targetRef="exceptionHandleTask">
<conditionExpression>${approve=='N'}</conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-b33e5cdc-e56b-4a8f-8956-2a3bb4f7e57a" sourceRef="confirmIsUseableTask" targetRef="teamLeaderTask" name="椹冲洖">
+ <conditionExpression>${approve=='R'}</conditionExpression>
+ </sequenceFlow>
+ <scriptTask id="exceptionHandleTask" scriptFormat="groovy">
+ <script><![CDATA[
+ execution.setVariable("exception", "1");
+ ]]></script>
+ </scriptTask>
+ <sequenceFlow id="sid-7f62f3c2-08bf-4007-807d-3403ad831ed5" sourceRef="exceptionHandleTask" targetRef="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf"/>
+ <sequenceFlow id="programmerEndLine" sourceRef="programmingTask" targetRef="exceptionHandleTask" name="宸ヨ壓鍛樼粨鏉�">
+ <conditionExpression>${approve=='E'}</conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_dispatch">
@@ -114,18 +126,33 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-7a5135fe-5eb1-425c-b920-3e2b5bf18454" bpmnElement="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb">
<omgdi:waypoint x="167.5" y="-4.0"/>
- <omgdi:waypoint x="175.0" y="-80.0"/>
+ <omgdi:waypoint x="-8.75" y="-77.5"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-223da197-47f2-44ef-847e-40d1fae1009b" bpmnElement="sid-80b50f96-7601-4ba2-8c32-968923170d25">
<omgdi:waypoint x="-93.75" y="37.5"/>
<omgdi:waypoint x="-51.25" y="-77.5"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="shape-d9e76c38-3a8a-476a-af94-90eb350e46e2" bpmnElement="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf">
- <omgdc:Bounds x="-320.0" y="-35.0" width="30.0" height="30.0"/>
+ <omgdc:Bounds x="-325.0" y="22.499998" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-961779c9-53bb-4d28-b5a6-2e16e2ab1c2f" bpmnElement="sid-1ef405f8-c119-4225-b41c-fb0aa978e42c">
<omgdi:waypoint x="-262.5" y="-76.25001"/>
- <omgdi:waypoint x="-297.5" y="-35.0"/>
+ <omgdi:waypoint x="-258.75" y="-40.0"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="edge-d08bab4f-6549-4732-9791-7be8d3fcbbfe" bpmnElement="sid-b33e5cdc-e56b-4a8f-8956-2a3bb4f7e57a">
+ <omgdi:waypoint x="-107.5" y="37.500004"/>
+ <omgdi:waypoint x="-210.0" y="-60.000008"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-99e2affe-de2c-43fb-8ab1-b1e26bb1c905" bpmnElement="exceptionHandleTask">
+ <omgdc:Bounds x="-300.0" y="-40.0" width="55.0" height="45.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-94f8ab21-dbbb-4ea4-9519-51002cbcfe4e" bpmnElement="sid-7f62f3c2-08bf-4007-807d-3403ad831ed5">
+ <omgdi:waypoint x="-300.0" y="-17.5"/>
+ <omgdi:waypoint x="-295.0" y="37.5"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="edge-a96e2c79-7b1b-4eef-9779-c6398a84f2ad" bpmnElement="programmerEndLine">
+ <omgdi:waypoint x="-72.5" y="-92.5"/>
+ <omgdi:waypoint x="-245.0" y="-28.75"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
--
Gitblit v1.9.3