From 5a5fc62457d23f34f10ae631dc0d94c09b7bcba9 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 4 Dec 2023 22:34:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=9B=B4=E6=96=B0=E9=80=89?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/common/utils/BpmnMetaParserHelper.java | 3 +-- .../delegate/AbstractBpmnTaskAssigneeSelector.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java index f4e94b981..c021a2294 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java @@ -14,7 +14,6 @@ import cn.axzo.workflow.common.model.request.bpmn.BpmnNoticeProperty; import cn.axzo.workflow.common.model.request.bpmn.BpmnPendingProperty; import cn.axzo.workflow.common.model.request.bpmn.BpmnSmsProperty; import com.alibaba.fastjson.JSON; -import com.google.common.collect.Lists; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.ExtensionElement; import org.flowable.bpmn.model.FlowElement; @@ -217,7 +216,7 @@ public final class BpmnMetaParserHelper { public static Optional> getApproverSpecifyValue(UserTask userTask) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY) .map(element -> StringUtils.hasLength(element.getElementText()) - ? Lists.newArrayList(JSON.parseArray(element.getElementText(), String.class)) + ? JSON.parseArray(element.getElementText(), String.class) : Collections.emptyList()); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java index 8a203bd27..06abf0f0b 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java @@ -1,7 +1,5 @@ package cn.axzo.workflow.server.controller.delegate; -import static cn.axzo.workflow.core.common.enums.BpmnErrorCode.CONVERTOR_META_DATA_FORMAT_ERROR; - import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.core.common.exception.WorkflowEngineException; @@ -28,6 +26,8 @@ import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Collectors; +import static cn.axzo.workflow.core.common.enums.BpmnErrorCode.CONVERTOR_META_DATA_FORMAT_ERROR; + /** * 抽象的流程任务审批人选择器 * @@ -80,12 +80,12 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign // 默认解析格式：[{"name":"预算员", "value":"xxxx"}] try { return BpmnMetaParserHelper.getApproverSpecifyValue(userTask) - .map(value -> value.stream() - .map(s -> Optional.ofNullable(JSON.parseObject(s).getString("value")) + .map(list -> list.stream().map(s -> Optional.ofNullable(JSON.parseObject(s).getString("value")) .orElse(null)) .filter(Objects::nonNull) .collect(Collectors.toList())).orElse(Collections.emptyList()); } catch (Exception e) { + e.getStackTrace(); throw new WorkflowEngineException(CONVERTOR_META_DATA_FORMAT_ERROR); } }