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> cls = Lists.newArrayList(List.class, Map.class); + List> 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(); }