wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 更新选人

Browse Source
This commit is contained in:
wangli 2023-12-04 22:34:44 +08:00
parent 1dbda28b7c
commit 5a5fc62457
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java
View File

@ -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.BpmnPendingProperty;
import cn.axzo.workflow.common.model.request.bpmn.BpmnSmsProperty; import cn.axzo.workflow.common.model.request.bpmn.BpmnSmsProperty;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.ExtensionElement; import org.flowable.bpmn.model.ExtensionElement;
import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.FlowElement;
@ -217,7 +216,7 @@ public final class BpmnMetaParserHelper {
public static Optional<List<String>> getApproverSpecifyValue(UserTask userTask) { public static Optional<List<String>> getApproverSpecifyValue(UserTask userTask) {
return defaultValid(userTask, CONFIG_APPROVER_SPECIFY) return defaultValid(userTask, CONFIG_APPROVER_SPECIFY)
.map(element -> StringUtils.hasLength(element.getElementText()) .map(element -> StringUtils.hasLength(element.getElementText())
? Lists.newArrayList(JSON.parseArray(element.getElementText(), String.class)) ? JSON.parseArray(element.getElementText(), String.class)
: Collections.emptyList()); : Collections.emptyList());
} }

8
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java
View File

@ -1,7 +1,5 @@
package cn.axzo.workflow.server.controller.delegate; 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.framework.domain.web.result.ApiResult;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.common.exception.WorkflowEngineException; import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
@ -28,6 +26,8 @@ import java.util.Optional;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; 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"}] // 默认解析格式：[{"name":"预算员", "value":"xxxx"}]
try { try {
return BpmnMetaParserHelper.getApproverSpecifyValue(userTask) return BpmnMetaParserHelper.getApproverSpecifyValue(userTask)
.map(value -> value.stream() .map(list -> list.stream().map(s -> Optional.ofNullable(JSON.parseObject(s).getString("value"))
.map(s -> Optional.ofNullable(JSON.parseObject(s).getString("value"))
.orElse(null)) .orElse(null))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList())).orElse(Collections.emptyList()); .collect(Collectors.toList())).orElse(Collections.emptyList());
} catch (Exception e) { } catch (Exception e) {
e.getStackTrace();
throw new WorkflowEngineException(CONVERTOR_META_DATA_FORMAT_ERROR); throw new WorkflowEngineException(CONVERTOR_META_DATA_FORMAT_ERROR);
} }
} }