From 42c17fe468ceea7e5eed7fec520b9858bed02e85 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 17:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowStatusListener.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowStatusListener.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowStatusListener.java
index f932e49..ffe275d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowStatusListener.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowStatusListener.java
@@ -29,6 +29,7 @@
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -62,13 +63,13 @@
String restURL = remoteMethod.getExpressionText();
String status = statusValue.getExpressionText();
//鑾峰彇涓氬姟鏁版嵁淇℃伅
- String oids = (String) taskVariable.get(FlowEngineConstant.OIDS);
+ List<String> oids = (List<String>) taskVariable.get(FlowEngineConstant.OIDS);
String btmType = (String) taskVariable.get(FlowEngineConstant.BTMTYPE);
taskVariable.put(FlowEngineConstant.REMOTE_METHOD,restURL);
taskVariable.put(FlowEngineConstant.STATUS_VALUE,status);
- if(StringUtils.isEmpty(oids)){
+ if(CollectionUtils.isEmpty(oids)){
throw new VciBaseException("鎵ц鐘舵�佷慨鏀逛簨浠舵椂锛屼笟鍔℃暟鎹畂id涓虹┖锛�");
}
if(StringUtils.isEmpty(btmType)){
@@ -86,7 +87,7 @@
FlowStatusDTO flowStatusDTO = new FlowStatusDTO();
flowStatusDTO.setBtmType(btmType);
- flowStatusDTO.setOids(VciBaseUtil.str2List(oids));
+ flowStatusDTO.setOids(oids);
flowStatusDTO.setVariableMap(taskVariable);
flowStatusDTO.setTaskHisVOList(FlowableUtils.listTaskHistory(delegateTask.getProcessInstanceId(),historyService,taskService));
@@ -115,7 +116,6 @@
if(CollectionUtils.isEmpty(result) && !(Boolean) result.get("success")){
throw new VciBaseException((String) result.get("message"));
}
-
}
}
--
Gitblit v1.9.3