ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 78554 【垂直越权】国内标准-垂直越权问题

Browse Source
This commit is contained in:
liao
2023-11-27 09:19:28 +08:00
parent af72562af1
commit e9d70ca171
5 changed files with 136 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java
+1 -1
View File
@@ -13,7 +13,7 @@ public class ConsultationTaskKey {
public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师审批
public static final String REJECT = "reject"; // 法规工程师驳回
public static final String REJECT = "reject"; // 驳回
public static final String DEPART_LEADER_START_1 = "depart_leader_start_1"; // 各部所主管级领导分发
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+10 -1
View File
@@ -356,12 +356,21 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
List<Execution> executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId).list();
log.info("还剩 {} 个任务待完成", taskList.size());
taskList.forEach(lastTask -> {
log.info("=======================================================================");
log.info("任务id: {}", lastTask.getId());
log.info("任务name: {}", lastTask.getName());
log.info("任务executionId: {}", lastTask.getExecutionId());
log.info("=======================================================================");
});
log.info("还剩 {} 个执行实例待完成", executionList.size());
taskList.forEach(lastTask -> log.info("任务id: {}", lastTask.getId()));
executionList.forEach(lastExecution -> {
log.info("=======================================================================");
log.info("执行实例id: {}", lastExecution.getId());
log.info("执行实例parentId: {}", lastExecution.getParentId());
log.info("执行实例name: {}", lastExecution.getName());
log.info("执行实例activityId: {}", lastExecution.getActivityId());
log.info("=======================================================================");
});
}
}
laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java
+3
View File
@@ -62,6 +62,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "国内标准-提出问题")
@ApiOperation(value="国内标准-提出问题", notes="国内标准-提出问题")
@PostMapping(value = "/addProblem/GB")
@RequiresPermissions("domesticStandard:submitQuestion")
public Result<T> addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("1");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
@@ -71,6 +72,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "海外标准-提出问题")
@ApiOperation(value="海外标准-提出问题", notes="海外标准-提出问题")
@PostMapping(value = "/addProblem/FB")
@RequiresPermissions("overseasStandard:submitQuestion")
public Result<T> addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("2");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
@@ -80,6 +82,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "企业标准-提出问题")
@ApiOperation(value="企业标准-提出问题", notes="企业标准-提出问题")
@PostMapping(value = "/addProblem/QB")
@RequiresPermissions("enterpriseStandard:detail:submitQuestion")
public Result<T> addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("3");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+3
View File
@@ -119,6 +119,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-国内分享", notes = "标准分享-国内分享")
@PostMapping(value = "/domestic/add")
@ApiOperationSupport(order = 3)
@RequiresPermissions("domesticStandard:share")
public Result<T> domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@@ -174,6 +175,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-海外分享", notes = "标准分享-海外分享")
@PostMapping(value = "/overseas/add")
@ApiOperationSupport(order = 4)
@RequiresPermissions("overseasStandard:share")
public Result<T> overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
// 发送消息
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -213,6 +215,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-企标分享", notes = "标准分享-企标分享")
@PostMapping(value = "/enterprise/add")
@ApiOperationSupport(order = 5)
@RequiresPermissions("enterpriseStandard:share")
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn
+119 -124
View File
@@ -116,7 +116,7 @@
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_09jjte7</bpmn:incoming>
<bpmn:outgoing>Flow_0zrmtql</bpmn:outgoing>
<bpmn:outgoing>Flow_17fjaez</bpmn:outgoing>
</bpmn:userTask>
<bpmn:userTask id="module_owner_end_2" name="模块负责人汇总填写意见（可跳过）" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
@@ -131,14 +131,12 @@
<bpmn:sequenceFlow id="Flow_14aeapm" sourceRef="module_owner_end_2" targetRef="depart_leader_end_1" />
<bpmn:endEvent id="Event_1nqj4x3">
<bpmn:incoming>Flow_0dy528b</bpmn:incoming>
<bpmn:incoming>Flow_17fjaez</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0dy528b" name="通过" sourceRef="Gateway_1xd2kp3" targetRef="Event_1nqj4x3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passSecond}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:endEvent id="Event_14mnbit">
<bpmn:incoming>Flow_0zrmtql</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0zrmtql" sourceRef="depart_leader_collect_2" targetRef="Event_14mnbit" />
<bpmn:sequenceFlow id="Flow_17fjaez" sourceRef="depart_leader_collect_2" targetRef="Event_1nqj4x3" />
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="engineer_start" targetRef="sub_process_1" />
<bpmn:userTask id="engineer_start_end" name="法规工程师审批" activiti:assignee="${engineer}">
@@ -206,7 +204,7 @@
<bpmn:sequenceFlow id="Flow_1ft2poj" name="驳回" sourceRef="Gateway_1pq4fen" targetRef="module_owner_end_3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passSecond}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="reject" name="法规工程师驳回" activiti:assignee="${departLeader}">
<bpmn:userTask id="reject" name="驳回" activiti:assignee="${departLeader}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
</bpmn:extensionElements>
@@ -249,8 +247,18 @@
<dc:Bounds x="160" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
<dc:Bounds x="1525" y="225" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
<dc:Bounds x="1662" y="232" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
<dc:Bounds x="1250" y="210" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0mj9ddw_di" bpmnElement="sub_process_1" isExpanded="true">
<dc:Bounds x="320" y="40" width="1120" height="690" />
<dc:Bounds x="320" y="40" width="880" height="690" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1olxq4s_di" bpmnElement="Event_1olxq4s">
<dc:Bounds x="342" y="382" width="36" height="36" />
@@ -276,46 +284,6 @@
<bpmndi:BPMNShape id="Event_1nqj4x3_di" bpmnElement="Event_1nqj4x3">
<dc:Bounds x="1112" y="482" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_14mnbit_di" bpmnElement="Event_14mnbit">
<dc:Bounds x="1022" y="602" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="sub_process_2" isExpanded="true">
<dc:Bounds x="680" y="100" width="660" height="210" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_15afvr9_di" bpmnElement="Event_15afvr9">
<dc:Bounds x="712" y="192" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0iu180q_di" bpmnElement="module_owner_start">
<dc:Bounds x="800" y="170" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1s6pnvt_di" bpmnElement="design_engineer_1">
<dc:Bounds x="960" y="170" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1ll5cul_di" bpmnElement="module_owner_end_1">
<dc:Bounds x="1120" y="170" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1vx05is_di" bpmnElement="Event_1vx05is">
<dc:Bounds x="1282" y="192" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_13krhma_di" bpmnElement="Flow_13krhma">
<di:waypoint x="748" y="210" />
<di:waypoint x="800" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0e4x3wm_di" bpmnElement="Flow_0e4x3wm">
<di:waypoint x="900" y="210" />
<di:waypoint x="960" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vnqotz_di" bpmnElement="Flow_0vnqotz">
<di:waypoint x="1060" y="210" />
<di:waypoint x="1120" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05e6l5d_di" bpmnElement="Flow_05e6l5d">
<di:waypoint x="1220" y="210" />
<di:waypoint x="1282" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Gateway_1xd2kp3_di" bpmnElement="Gateway_1xd2kp3" isMarkerVisible="true">
<dc:Bounds x="935" y="475" width="50" height="50" />
</bpmndi:BPMNShape>
@@ -327,6 +295,43 @@
<dc:Bounds x="910" y="341" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="sub_process_2" isExpanded="true">
<dc:Bounds x="430" y="70" width="660" height="210" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_15afvr9_di" bpmnElement="Event_15afvr9">
<dc:Bounds x="462" y="162" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0iu180q_di" bpmnElement="module_owner_start">
<dc:Bounds x="550" y="140" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1s6pnvt_di" bpmnElement="design_engineer_1">
<dc:Bounds x="710" y="140" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1ll5cul_di" bpmnElement="module_owner_end_1">
<dc:Bounds x="870" y="140" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1vx05is_di" bpmnElement="Event_1vx05is">
<dc:Bounds x="1032" y="162" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_13krhma_di" bpmnElement="Flow_13krhma">
<di:waypoint x="498" y="180" />
<di:waypoint x="550" y="180" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0e4x3wm_di" bpmnElement="Flow_0e4x3wm">
<di:waypoint x="650" y="180" />
<di:waypoint x="710" y="180" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vnqotz_di" bpmnElement="Flow_0vnqotz">
<di:waypoint x="810" y="180" />
<di:waypoint x="870" y="180" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05e6l5d_di" bpmnElement="Flow_05e6l5d">
<di:waypoint x="970" y="180" />
<di:waypoint x="1032" y="180" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1gv6jmb_di" bpmnElement="Flow_1gv6jmb">
<di:waypoint x="378" y="400" />
<di:waypoint x="430" y="400" />
@@ -348,14 +353,13 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ezcutn_di" bpmnElement="Flow_1ezcutn">
<di:waypoint x="610" y="375" />
<di:waypoint x="610" y="210" />
<di:waypoint x="680" y="210" />
<di:waypoint x="610" y="280" />
<bpmndi:BPMNLabel>
<dc:Bounds x="620" y="291" width="11" height="14" />
<dc:Bounds x="620" y="324" width="12" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0oc8671_di" bpmnElement="Flow_0oc8671">
<di:waypoint x="760" y="310" />
<di:waypoint x="760" y="280" />
<di:waypoint x="760" y="340" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_18olfei_di" bpmnElement="Flow_18olfei">
@@ -381,102 +385,93 @@
<dc:Bounds x="1038" y="482" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0zrmtql_di" bpmnElement="Flow_0zrmtql">
<bpmndi:BPMNEdge id="Flow_17fjaez_di" bpmnElement="Flow_17fjaez">
<di:waypoint x="890" y="620" />
<di:waypoint x="1022" y="620" />
<di:waypoint x="1130" y="620" />
<di:waypoint x="1130" y="518" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
<dc:Bounds x="1560" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
<dc:Bounds x="1715" y="375" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
<dc:Bounds x="1822" y="382" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qqp5sb_di" bpmnElement="sub_process_3" isExpanded="true">
<dc:Bounds x="1490" y="480" width="838" height="310" />
<dc:Bounds x="1240" y="350" width="838" height="310" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0eapre1_di" bpmnElement="Event_0eapre1">
<dc:Bounds x="1510" y="582" width="36" height="36" />
<dc:Bounds x="1260" y="452" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_00so089" bpmnElement="module_owner_end_3">
<dc:Bounds x="1828" y="560" width="100" height="80" />
<dc:Bounds x="1578" y="430" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_035drax" bpmnElement="depart_leader_end_4">
<dc:Bounds x="1998" y="560" width="100" height="80" />
<dc:Bounds x="1748" y="430" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1pq4fen_di" bpmnElement="Gateway_1pq4fen" isMarkerVisible="true">
<dc:Bounds x="2163" y="575" width="50" height="50" />
<dc:Bounds x="1913" y="445" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07vxc54_di" bpmnElement="Event_07vxc54">
<dc:Bounds x="2260" y="582" width="36" height="36" />
<dc:Bounds x="2010" y="452" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_19cqaly" bpmnElement="reject">
<dc:Bounds x="1578" y="560" width="100" height="80" />
<dc:Bounds x="1328" y="430" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0vnihbs_di" bpmnElement="Gateway_0vnihbs" isMarkerVisible="true">
<dc:Bounds x="1723" y="575" width="50" height="50" />
<dc:Bounds x="1473" y="445" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0k4hx5w" bpmnElement="depart_leader_collect_3">
<dc:Bounds x="1828" y="660" width="100" height="80" />
<dc:Bounds x="1578" y="530" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
<di:waypoint x="1928" y="600" />
<di:waypoint x="1998" y="600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
<di:waypoint x="2098" y="600" />
<di:waypoint x="2163" y="600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
<di:waypoint x="2213" y="600" />
<di:waypoint x="2260" y="600" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2222" y="582" width="23" height="14" />
</bpmndi:BPMNLabel>
<bpmndi:BPMNEdge id="Flow_07p5ivp_di" bpmnElement="Flow_07p5ivp">
<di:waypoint x="1296" y="470" />
<di:waypoint x="1328" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ft2poj_di" bpmnElement="Flow_1ft2poj">
<di:waypoint x="2188" y="575" />
<di:waypoint x="2188" y="510" />
<di:waypoint x="1878" y="510" />
<di:waypoint x="1878" y="560" />
<di:waypoint x="1938" y="445" />
<di:waypoint x="1938" y="380" />
<di:waypoint x="1628" y="380" />
<di:waypoint x="1628" y="430" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2024" y="492" width="22" height="14" />
<dc:Bounds x="1774" y="362" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_07p5ivp_di" bpmnElement="Flow_07p5ivp">
<di:waypoint x="1546" y="600" />
<di:waypoint x="1578" y="600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ybap2u_di" bpmnElement="Flow_1ybap2u">
<di:waypoint x="1678" y="600" />
<di:waypoint x="1723" y="600" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1vn8jk5_di" bpmnElement="Flow_1vn8jk5">
<di:waypoint x="1773" y="600" />
<di:waypoint x="1828" y="600" />
<di:waypoint x="1523" y="470" />
<di:waypoint x="1578" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1790" y="582" width="22" height="14" />
<dc:Bounds x="1540" y="452" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1tg5cq9_di" bpmnElement="Flow_1tg5cq9">
<di:waypoint x="1748" y="625" />
<di:waypoint x="1748" y="700" />
<di:waypoint x="1828" y="700" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1761" y="660" width="33" height="14" />
</bpmndi:BPMNLabel>
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
<di:waypoint x="1678" y="470" />
<di:waypoint x="1748" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
<di:waypoint x="1848" y="470" />
<di:waypoint x="1913" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132k5wt_di" bpmnElement="Flow_132k5wt">
<di:waypoint x="1928" y="700" />
<di:waypoint x="2188" y="700" />
<di:waypoint x="2188" y="625" />
<di:waypoint x="1678" y="570" />
<di:waypoint x="1938" y="570" />
<di:waypoint x="1938" y="495" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
<di:waypoint x="1963" y="470" />
<di:waypoint x="2010" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1972" y="452" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ybap2u_di" bpmnElement="Flow_1ybap2u">
<di:waypoint x="1428" y="470" />
<di:waypoint x="1473" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1tg5cq9_di" bpmnElement="Flow_1tg5cq9">
<di:waypoint x="1498" y="495" />
<di:waypoint x="1498" y="570" />
<di:waypoint x="1578" y="570" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1511" y="530" width="34" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1d5objw_di" bpmnElement="Flow_1d5objw">
<di:waypoint x="210" y="318" />
@@ -487,30 +482,30 @@
<di:waypoint x="320" y="400" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_19vxot3_di" bpmnElement="Flow_19vxot3">
<di:waypoint x="1440" y="400" />
<di:waypoint x="1560" y="400" />
<di:waypoint x="1200" y="250" />
<di:waypoint x="1250" y="250" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1125yee_di" bpmnElement="Flow_1125yee">
<di:waypoint x="1660" y="400" />
<di:waypoint x="1715" y="400" />
<di:waypoint x="1350" y="250" />
<di:waypoint x="1525" y="250" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0sb0q1z_di" bpmnElement="Flow_0sb0q1z">
<di:waypoint x="1765" y="400" />
<di:waypoint x="1822" y="400" />
<di:waypoint x="1575" y="250" />
<di:waypoint x="1662" y="250" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1772" y="378" width="22" height="14" />
<dc:Bounds x="1592" y="228" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0jjkrst_di" bpmnElement="Flow_0jjkrst">
<di:waypoint x="1740" y="425" />
<di:waypoint x="1740" y="480" />
<di:waypoint x="1550" y="275" />
<di:waypoint x="1550" y="350" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1747" y="449" width="21" height="14" />
<dc:Bounds x="1557" y="311" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_06kgad6_di" bpmnElement="Flow_06kgad6">
<di:waypoint x="1610" y="480" />
<di:waypoint x="1610" y="440" />
<di:waypoint x="1300" y="350" />
<di:waypoint x="1300" y="290" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>