diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index 245a742..12590e1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -40,6 +40,7 @@ import com.ruoyi.workflow.mapper.WfDeployFormMapper; import com.ruoyi.workflow.service.IWfProcessService; import com.ruoyi.workflow.service.IWfTaskService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.constants.BpmnXMLConstants; import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.*; @@ -66,6 +67,7 @@ import java.util.stream.Collectors; * @author KonBAI * @createTime 2022/3/24 18:57 */ +@Slf4j @RequiredArgsConstructor @Service public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProcessService { @@ -207,6 +209,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce taskVo.setProcDefName(hisIns.getProcessDefinitionName()); taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion()); taskVo.setCategory(deployment.getCategory()); + // 当前所处流程 List taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list(); if (CollUtil.isNotEmpty(taskList)) { @@ -301,7 +304,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce flowTask.setProcDefName(pd.getName()); flowTask.setProcDefVersion(pd.getVersion()); flowTask.setProcInsId(task.getProcessInstanceId()); - + flowTask.setCategory(pd.getCategory()); // 流程发起人信息 HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()) @@ -513,9 +516,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce //获取部门信息(新增于2024年2月29日) SysUser sysUser = sysUserService.selectUserById(userId); - SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId()); - flowTask.setDeptName(sysDept.getDeptName()); - + if (sysUser.getDeptId()!=null){ + SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId()); + flowTask.setDeptName(sysDept.getDeptName()); + } // 流程变量 flowTask.setProcVars(histTask.getProcessVariables());