From d6420121aff1dad388881f94623fea4f94bd3738 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 5 Dec 2023 10:00:13 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=9B=B4=E6=96=B0=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/common/utils/BpmnMetaParserHelper.java | 7 +++---- .../delegate/AbstractBpmnTaskAssigneeSelector.java | 9 ++++----- 2 files changed, 7 insertions(+), 9 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 c021a2294..8fb3e74c0 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 @@ -13,7 +13,6 @@ import cn.axzo.workflow.common.model.request.bpmn.BpmnNoticeConf; 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 org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.ExtensionElement; import org.flowable.bpmn.model.FlowElement; @@ -213,11 +212,11 @@ public final class BpmnMetaParserHelper { .map(element -> ApproverSpecifyEnum.valueOf(element.getAttributeValue(null, ELEMENT_ATTRIBUTE_VALUE))); } - public static Optional> getApproverSpecifyValue(UserTask userTask) { + public static Optional getApproverSpecifyValue(UserTask userTask) { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY) .map(element -> StringUtils.hasLength(element.getElementText()) - ? JSON.parseArray(element.getElementText(), String.class) - : Collections.emptyList()); + ? element.getElementText() + : "{}"); } public static Optional getApproverEmptyHandleType(UserTask userTask) { 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 b19719a9b..270340968 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 @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Supplier; -import java.util.stream.Collectors; import static cn.axzo.workflow.core.common.enums.BpmnErrorCode.CONVERTOR_META_DATA_FORMAT_ERROR; @@ -74,11 +73,11 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign // 默认解析格式：[{"name":"预算员", "value":"xxxx"}] try { return BpmnMetaParserHelper.getApproverSpecifyValue(userTask) - .map(strings -> strings.stream().map(i -> JSON.parseObject(i).getString("value")) - .collect(Collectors.toList())) + .map(s -> JSON.parseArray(s, String.class)) .orElse(Collections.emptyList()); - } catch (Exception e) { - throw new WorkflowEngineException(CONVERTOR_META_DATA_FORMAT_ERROR, "AbstractBpmnTaskAssigneeSelector#getTypes", e.getMessage()); + } catch (Exception e) { + throw new WorkflowEngineException(CONVERTOR_META_DATA_FORMAT_ERROR, "AbstractBpmnTaskAssigneeSelector" + + "#getTypes", e.getMessage()); } }