From 8109acb63c9a9a8018f6503b9944eb175a9f30ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 01 九月 2023 10:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java | 12 ------------
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 12 ++++++++----
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
index 6aca608..aab06b5 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -294,18 +294,6 @@
// 瀹屾垚浠诲姟
taskService.complete(taskId, variables);
-// //璁剧疆涓嬩竴姝ュ鏍镐汉
-// Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).active().singleResult();//涓嬩竴姝ヨ妭鐐�
-// String taskKey = task.getTaskDefinitionKey();//灏辨槸娴佺▼閰嶇疆鐨勮妭鐐筰d
-// Object to = getVar(processInstanceId,taskKey);
-// if(to==null){
-// throw new ServiceException(taskKey+"娌℃湁璁剧疆瀹℃牳浜�");
-// }
-// String assignee = to.toString();
-//
-// if(StringUtils.isNotEmpty(assignee)) {
-// task.setAssignee(assignee);
-// }
return true;
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
index 63e35bb..6502574 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
@@ -199,17 +199,21 @@
flowTaskUserCi.setToTaskName(targetFlow.getName());
taskList.add(flowTaskUserCi);
}
- // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓烘帓浠栫綉鍏�
- if (targetFlow instanceof ExclusiveGateway) {
+ // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓虹綉鍏�
+ if (targetFlow instanceof Gateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow;
List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows();
for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){
String conditionExpression = nexti.getConditionExpression();//condition
+
String taskId = nexti.getTargetRef();//taskId
String name = nexti.getName();//toName,椹冲洖銆佸悓鎰�
- String taskName = taskMap.get(targetFlow.getId());
-
+ String taskName = taskMap.get(taskId);
+//ExclusiveGateway
+ if(StringUtils.isEmpty(conditionExpression)){//姝ゆ椂鎺掍粬缃戝叧娌℃湁閰嶇疆娴佽浆鏉′欢
+ continue;
+ }
for (FlowTaskDTO flowTaskUserCi:mis){
if(taskId.equals(flowTaskUserCi.getTaskId())){
flowTaskUserCi.setCondition(conditionExpression);
--
Gitblit v1.9.3