DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 修复"我的流程"流程分类显示错误问题

Browse Source
This commit is contained in:
konbai
2022-02-27 16:38:34 +08:00
parent 3e0349f164
commit c4d7f300bf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
View File

@@ -42,6 +42,7 @@ import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricActivityInstanceQuery; import org.flowable.engine.history.HistoricActivityInstanceQuery;
import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery; import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.runtime.ProcessInstance;
@@ -437,15 +438,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
long time = System.currentTimeMillis() - hisIns.getStartTime().getTime(); long time = System.currentTimeMillis() - hisIns.getStartTime().getTime();
flowTask.setDuration(getDate(time)); flowTask.setDuration(getDate(time));
} }
// 流程定义信息 // 流程部署实例信息
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() Deployment deployment = repositoryService.createDeploymentQuery()
.processDefinitionId(hisIns.getProcessDefinitionId()) .deploymentId(hisIns.getDeploymentId()).singleResult();
.singleResult(); flowTask.setDeployId(hisIns.getDeploymentId());
flowTask.setDeployId(processDefinition.getDeploymentId());
flowTask.setProcDefId(hisIns.getProcessDefinitionId()); flowTask.setProcDefId(hisIns.getProcessDefinitionId());
flowTask.setProcDefName(processDefinition.getName()); flowTask.setProcDefName(hisIns.getProcessDefinitionName());
flowTask.setProcDefVersion(processDefinition.getVersion()); flowTask.setProcDefVersion(hisIns.getProcessDefinitionVersion());
flowTask.setCategory(processDefinition.getCategory()); flowTask.setCategory(deployment.getCategory());
// 当前所处流程 todo: 本地启动放开以下注释 // 当前所处流程 todo: 本地启动放开以下注释
// List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); // List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
// if (CollectionUtils.isNotEmpty(taskList)) { // if (CollectionUtils.isNotEmpty(taskList)) {