From ed32d6020c7be9808bd95083b3115bcc96cfe806 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 18 Jun 2024 14:09:10 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2516)=20-=20=E5=B0=86=E5=8F=97?=
 =?UTF-8?q?=E9=99=90=E8=AE=BF=E9=97=AE=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=90=8C=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E8=BF=99=E4=BA=9B=E6=8E=A5=E5=8F=A3=E5=A4=A7?=
 =?UTF-8?q?=E5=A4=9A=E6=95=B0=E9=83=BD=E6=98=AF=E8=A6=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=BE=97=E5=88=B0=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/impl/BpmnProcessModelServiceImpl.java       | 2 +-
 .../starter/feign/ext/WorkflowEngineStarterDecoder.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java
index e48bf26e2..680eb9ef1 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java
@@ -455,7 +455,7 @@ public class BpmnProcessModelServiceImpl implements BpmnProcessModelService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        return list.stream().map(Model::getTenantId).collect(Collectors.toList());
+        return list.stream().map(Model::getTenantId).distinct().collect(Collectors.toList());
     }
 
     private void updateProcessDefinitionSuspended(String deploymentId) {
diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java
index 4dae9b073..065696f47 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java
@@ -12,6 +12,7 @@ import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -61,7 +62,7 @@ final class WorkflowEngineStarterDecoder implements Decoder {
      */
     Object convert(Response response, Type type) throws IOException {
         ParameterizedTypeImpl wrappedType;
-        List<Class<?>> cls = Lists.newArrayList(List.class, Map.class);
+        List<Class<?>> cls = Lists.newArrayList(Collection.class, List.class, Map.class);
         if (type instanceof ParameterizedType && !cls.contains(((ParameterizedType) type).getRawType())) {
             wrappedType = (ParameterizedTypeImpl) type;
         } else {
@@ -71,7 +72,7 @@ final class WorkflowEngineStarterDecoder implements Decoder {
         if (decode instanceof CommonResponse) {
             CommonResponse<?> commonResponse = (CommonResponse<?>) decode;
             if (response.status() == 202) {
-                log.warn("workflow engine starter rpc invoke return msg: {}", commonResponse.getMsg());
+                log.error("workflow engine starter rpc invoke return msg: {}", commonResponse.getMsg());
             }
             return commonResponse.getData();
         }