From d3b1bfc3fbe2fc2f19ad5c4ef7d8df7b2ffbd2bb Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 26 六月 2023 14:48:16 +0800
Subject: [PATCH] 主数据流程添加自定义需要的流程变量

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

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 0fde0f7..f1deaf9 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
@@ -192,7 +192,7 @@
 						for (FlowTaskDTO flowTaskUserCi:mis){
 							if(taskId.equals(flowTaskUserCi.getTaskId())){
 								flowTaskUserCi.setCondition(conditionExpression);
-								if(conditionExpression.split("=").length>1) {
+								if(conditionExpression.contains("=")||conditionExpression.contains("<")||conditionExpression.contains(">")) {
 									conditionExpression = conditionExpression.replace("${","").replace("}","").replaceAll("\"","");
 									String[] conditionExpressionStr = conditionExpression.split("==");
 									if(conditionExpression.contains("<")){
@@ -217,6 +217,10 @@
 				}
 			}
 		}
+		Map<String,Object> variables = runtimeService.getVariables(processInstanceId);
+		if(!variables.isEmpty()){
+			flowTaskDTO.setVariables(variables);
+		}
 		return flowTaskDTO;
 	}
 }

--
Gitblit v1.9.3