BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 只展示任务节点办理人信息

rf
tony 2023-03-02 21:17:25 +08:00
parent a4a12075e5
commit fe8059c419
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
View File

@ -549,23 +549,27 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (CollectionUtils.isNotEmpty(taskList)) { if (CollectionUtils.isNotEmpty(taskList)) {
flowTask.setTaskId(taskList.get(0).getId()); flowTask.setTaskId(taskList.get(0).getId());
flowTask.setTaskName(taskList.get(0).getName()); flowTask.setTaskName(taskList.get(0).getName());
// 当前任务节点办理人信息 if (StringUtils.isNotBlank(taskList.get(0).getAssignee())) {
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(taskList.get(0).getAssignee())); // 当前任务节点办理人信息
if (Objects.nonNull(sysUser)) { SysUser sysUser = sysUserService.selectUserById(Long.parseLong(taskList.get(0).getAssignee()));
flowTask.setAssigneeId(sysUser.getUserId()); if (Objects.nonNull(sysUser)) {
flowTask.setAssigneeName(sysUser.getNickName()); flowTask.setAssigneeId(sysUser.getUserId());
flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : ""); flowTask.setAssigneeName(sysUser.getNickName());
flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
}
} }
} else { } else {
List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
flowTask.setTaskId(historicTaskInstance.get(0).getId()); flowTask.setTaskId(historicTaskInstance.get(0).getId());
flowTask.setTaskName(historicTaskInstance.get(0).getName()); flowTask.setTaskName(historicTaskInstance.get(0).getName());
// 当前任务节点办理人信息 if (StringUtils.isNotBlank(historicTaskInstance.get(0).getAssignee())) {
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee())); // 当前任务节点办理人信息
if (Objects.nonNull(sysUser)) { SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee()));
flowTask.setAssigneeId(sysUser.getUserId()); if (Objects.nonNull(sysUser)) {
flowTask.setAssigneeName(sysUser.getNickName()); flowTask.setAssigneeId(sysUser.getUserId());
flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : ""); flowTask.setAssigneeName(sysUser.getNickName());
flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
}
} }
} }
flowList.add(flowTask); flowList.add(flowTask);