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

update - 调整 tenantId 的用法逻辑

Browse Source
This commit is contained in:
wangli 2023-11-27 20:59:48 +08:00
parent 78d54bfac9
commit 9c9046db5b
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java
View File

@ -188,19 +188,27 @@ public class BpmnProcessDefinitionServiceImpl implements BpmnProcessDefinitionSe
@Override @Override
public BpmnProcessDefinitionVO getActiveProcessDefinitionByKey(String key, String tenantId) { public BpmnProcessDefinitionVO getActiveProcessDefinitionByKey(String key, String tenantId) {
ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery() List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery()
.processDefinitionKey(key) .processDefinitionKey(key)
.latestVersion(); .list();
if (StringUtils.hasLength(tenantId)) {
query.processDefinitionTenantId(tenantId); if (CollectionUtils.isEmpty(list)) {
} else {
// 公共模型没有租户
query.processDefinitionTenantId("");
}
ProcessDefinition processDefinition = query.singleResult();
if (Objects.isNull(processDefinition)) {
throw new WorkflowEngineException(PROCESS_DEFINITION_KEY_NOT_EXISTS, key); throw new WorkflowEngineException(PROCESS_DEFINITION_KEY_NOT_EXISTS, key);
} }
ProcessDefinition processDefinition;
List<ProcessDefinition> filterDefinitions = list.stream()
.filter(i -> Objects.equals(tenantId, i.getTenantId()) || Objects.equals("", i.getTenantId()))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(filterDefinitions)) {
throw new WorkflowEngineException(PROCESS_DEFINITION_KEY_NOT_EXISTS, key);
} else if (filterDefinitions.size() == 1) {
processDefinition = filterDefinitions.get(0);
} else {
processDefinition = filterDefinitions.stream().filter(i -> Objects.equals(tenantId, i.getKey())).findFirst()
.orElseThrow(() -> new WorkflowEngineException(PROCESS_DEFINITION_ID_NOT_EXISTS));
}
return processDefinitionConverter.toVo(processDefinition); return processDefinitionConverter.toVo(processDefinition);
} }

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -248,7 +248,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
.businessKey(dto.getBusinessKey()) .businessKey(dto.getBusinessKey())
.variables(dto.getVariables()) .variables(dto.getVariables())
.name(name) .name(name)
.tenantId(dto.getInitiator().getTenantId()) .overrideProcessDefinitionTenantId(dto.getTenantId())
.start(); .start();
return instance.getProcessInstanceId(); return instance.getProcessInstanceId();
} }