流程推进统计展示任务信息时，处理人是变量的情况完善

xiangpei

2025-02-10 6a754a7e1e5684e2e1efdb08b210334dc37680d8

流程推进统计展示任务信息时，处理人是变量的情况完善

 business/src/main/java/com/ycl/domain/entity/ProjectProcess.java

@@ -31,4 +31,8 @@
    /** 流程实例id */
    private String processInsId;

    @TableField("data_launch")
    /** 数据提交放/业主单位id */
    private Long dataLaunch;

}

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -91,6 +91,7 @@
    private final ISysFormService formService;
    private final ProcessCodingService processCodingService;
    private final ApplicationEventPublisher publisher;
    private final ISysDeptService deptService;

    /**
     * 分页查询
@@ -140,11 +141,23 @@
                }
            }
        }
        String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId());
        ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
                .select(ProjectInfo::getCreateBy)
                .eq(ProjectInfo::getId, form.getProjectId())
                .one();
        if (Objects.isNull(project)) {
            throw new RuntimeException("项目不存在");
        }
        SysUser user = sysUserService.selectUserById(project.getCreateBy());
        if (Objects.isNull(user)) {
            throw new RuntimeException("项目业主单位不存在");
        }
        String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId(), user.getDeptId());
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(ProjectProcess::getProjectId, form.getProjectId())
                .set(ProjectProcess::getProcessDefId, form.getProcessDefId())
                .set(ProjectProcess::getProcessInsId, processInsId)
                .set(ProjectProcess::getDataLaunch, project.getCreateBy())
                .update();
        return Result.ok("流程变更成功");
    }
@@ -152,11 +165,23 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result startProcess(Long projectId, String processDefId) {
        String processInsId = this.startPro(projectId, processDefId);
        ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
                .select(ProjectInfo::getCreateBy)
                .eq(ProjectInfo::getId, projectId)
                .one();
        if (Objects.isNull(project)) {
            throw new RuntimeException("项目不存在");
        }
        SysUser user = sysUserService.selectUserById(project.getCreateBy());
        if (Objects.isNull(user)) {
            throw new RuntimeException("项目业主单位不存在");
        }
        String processInsId = this.startPro(projectId, processDefId, user.getDeptId());
        ProjectProcess entity = new ProjectProcess();
        entity.setProjectId(projectId);
        entity.setProcessDefId(processDefId);
        entity.setProcessInsId(processInsId);
        entity.setDataLaunch(project.getCreateBy());
        baseMapper.insert(entity);

        return Result.ok("流程启动成功");
@@ -169,15 +194,9 @@
     * @param processDefId
     * @return
     */
    private String startPro(Long projectId, String processDefId) {
    private String startPro(Long projectId, String processDefId, Long createBy) {

        ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
                .select(ProjectInfo::getCreateBy)
                .eq(ProjectInfo::getId, projectId)
                .one();
        if (Objects.isNull(project)) {
            throw new RuntimeException("项目不存在");
        }

        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefId)
                .latestVersion().singleResult();
        if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
@@ -190,7 +209,7 @@
        variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());

        // 将该项目的申请人（业主方）作为流程中某些环节的处理人
        variables.put(ProcessConstants.DATA_LAUNCH, project.getCreateBy());
        variables.put(ProcessConstants.DATA_LAUNCH, createBy);
        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
        return processInstance.getId();
    }
@@ -240,7 +259,7 @@
        Result result = Result.ok();

        // 代办任务
        this.getTodoTaskList(projectProcess.getProcessInsId(), "", 5, 1, result);
        this.getTodoTaskList(projectProcess.getProjectId(), projectProcess.getProcessInsId(), "", 5, 1, result);
        return result.data(detail);
    }

@@ -257,25 +276,25 @@
        Result ok = Result.ok();
        switch (query.getTaskType()) {
            case TaskTypeConstant.ALL:
                this.getAllUserTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                this.getAllUserTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            case TaskTypeConstant.TODO:
                this.getTodoTaskList(projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getPageSize(), (int) query.getCurrentPage(), ok);
                this.getTodoTaskList(query.getProjectId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getPageSize(), (int) query.getCurrentPage(), ok);
                ok.data(ok.get("taskList"));
                break;
            case TaskTypeConstant.CURRENT:
                break;
            case TaskTypeConstant.REMAINING:
                this.getRemainingTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                this.getRemainingTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            case TaskTypeConstant.TIMELY:
                this.getTimelyTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            case TaskTypeConstant.OVERTIME:
                this.getOvertimeTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                this.getOvertimeTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            case TaskTypeConstant.WILL_OVER_TIME:
                this.getWillOvertimeTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                this.getWillOvertimeTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            default:
                break;
@@ -340,6 +359,10 @@
            List<String> handlerNames = new ArrayList<>(2);
            List<Long> handlerUnitIds = new ArrayList<>(2);
            List<String> handlerUnitNames = new ArrayList<>(2);
            taskVO.setHandlerId(handlerIds);
            taskVO.setHandlerName(handlerNames);
            taskVO.setHandlerUnitId(handlerUnitIds);
            taskVO.setHandlerUnitName(handlerUnitNames);

            // 流程处理人信息
            List<IdentityLink> identityLinks = taskService.getIdentityLinksForTask(task.getId());
@@ -383,10 +406,8 @@
                    }
                }
            }
            taskVO.setHandlerId(handlerIds);
            taskVO.setHandlerName(handlerNames);
            taskVO.setHandlerUnitId(handlerUnitIds);
            taskVO.setHandlerUnitName(handlerUnitNames);

            this.distinctVo(taskVO);
            vos.add(taskVO);
        }
        if (vos.size() < pageSize) {
@@ -616,13 +637,14 @@
    /**
     * 查询待办任务
     *
     * @param projectId
     * @param processInsId
     * @param taskName
     * @param pageSize
     * @param pageNum
     * @param result
     */
    public void getTodoTaskList(String processInsId, String taskName, int pageSize, int pageNum, Result result) {
    public void getTodoTaskList(Long projectId, String processInsId, String taskName, int pageSize, int pageNum, Result result) {
        TaskQuery taskQuery = taskService.createTaskQuery()
                .active()
                .processInstanceId(processInsId)
@@ -637,7 +659,7 @@
        List<CustomerTaskVO> vos = new ArrayList<>();
        for (Task task : taskList) {
            CustomerTaskVO taskVO = new CustomerTaskVO();
            this.setRuntimeTaskInfo(task, taskVO);
            this.setRuntimeTaskInfo(task, taskVO, projectId);
            vos.add(taskVO);
        }
        result.put("taskList", vos);
@@ -646,6 +668,7 @@
    /**
     * 获取所有任务
     *
     * @param projectId 项目id
     * @param processDefinitionId 流程运行id
     * @param processInsId        流程实例id
     * @param pageNum
@@ -653,7 +676,7 @@
     * @param result
     * @return
     */
    private List<CustomerTaskVO> getAllUserTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
    private List<CustomerTaskVO> getAllUserTask(Long projectId, String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
        int startNum = pageSize * (pageNum - 1);
        int endNum = startNum + pageSize;
        List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);
@@ -694,6 +717,10 @@
            List<String> handlerNames = new ArrayList<>(2);
            List<Long> handlerUnitIds = new ArrayList<>(2);
            List<String> handlerUnitNames = new ArrayList<>(2);
            vo.setHandlerId(handlerIds);
            vo.setHandlerName(handlerNames);
            vo.setHandlerUnitId(handlerUnitIds);
            vo.setHandlerUnitName(handlerUnitNames);

            if (Objects.isNull(task)) {
                // 如果任务在运行时没找到，那么可能为未开始或者已完成，需要从历史任务中再找一下
@@ -712,7 +739,7 @@
                        vo.setHandlerType(HandlerTypeEnum.USER);
                        // 处理变量表达式
                        if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
                            handlerNames.add(userTask.getAssignee());
                            this.varReview(vo, projectId, processInsId);
                        } else {
                            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                            if (Objects.nonNull(sysUser)) {
@@ -769,10 +796,6 @@
                    vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
                    this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
                }
                vo.setHandlerId(handlerIds);
                vo.setHandlerName(handlerNames);
                vo.setHandlerUnitId(handlerUnitIds);
                vo.setHandlerUnitName(handlerUnitNames);
            } else {
                vo.setTaskStatus(TaskStatusEnum.TODO);
                vo.setTaskId(task.getId());
@@ -781,9 +804,9 @@
                vo.setTaskDefinitionKey(task.getTaskDefinitionKey());

                this.setPromoterAndHandler(vo, null);
                this.setRuntimeTaskInfo(task, vo);
                this.setRuntimeTaskInfo(task, vo, projectId);
            }

            this.distinctVo(vo);
            return vo;
        }).collect(Collectors.toList());
        result.data(vos);
@@ -842,8 +865,9 @@
     *
     * @param task 任务
     * @param taskVO 任务vo
     * @param projectId 项目id
     */
    private void setRuntimeTaskInfo(Task task, CustomerTaskVO taskVO) {
    private void setRuntimeTaskInfo(Task task, CustomerTaskVO taskVO, Long projectId) {
        // 当前流程信息
        taskVO.setTaskId(task.getId());
        taskVO.setCreateTime(task.getCreateTime());
@@ -876,6 +900,10 @@
        List<String> handlerNames = new ArrayList<>(2);
        List<Long> handlerUnitIds = new ArrayList<>(2);
        List<String> handlerUnitNames = new ArrayList<>(2);
        taskVO.setHandlerId(handlerIds);
        taskVO.setHandlerName(handlerNames);
        taskVO.setHandlerUnitId(handlerUnitIds);
        taskVO.setHandlerUnitName(handlerUnitNames);

        // 流程处理人信息
        List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
@@ -885,6 +913,11 @@
//            }
            // 绑定的是用户，查出用户姓名、部门
            if (StringUtils.isNotBlank(identityLink.getUserId())) {
                // 处理变量表达式
                if (identityLink.getUserId().contains(ProcessConstants.DATA_LAUNCH)) {
                    this.varReview(taskVO, projectId, task.getProcessInstanceId());
                    continue;
                }
                taskVO.setHandlerType(HandlerTypeEnum.USER);
                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
                if (Objects.nonNull(sysUser)) {
@@ -917,10 +950,8 @@
                    }
                }
            }
            taskVO.setHandlerId(handlerIds);
            taskVO.setHandlerName(handlerNames);
            taskVO.setHandlerUnitId(handlerUnitIds);
            taskVO.setHandlerUnitName(handlerUnitNames);

            this.distinctVo(taskVO);
        }
    }

@@ -1029,6 +1060,10 @@
            List<String> handlerNames = new ArrayList<>(2);
            List<Long> handlerUnitIds = new ArrayList<>(2);
            List<String> handlerUnitNames = new ArrayList<>(2);
            vo.setHandlerId(handlerIds);
            vo.setHandlerName(handlerNames);
            vo.setHandlerUnitId(handlerUnitIds);
            vo.setHandlerUnitName(handlerUnitNames);

            HistoricTaskInstance hisTask = keyMap.get(userTask.getId());
            if (Objects.nonNull(hisTask)) {
@@ -1050,10 +1085,8 @@
                vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
                this.setPromoterAndHandler(vo, hisTask.getIdentityLinks());
            }
            vo.setHandlerId(handlerIds);
            vo.setHandlerName(handlerNames);
            vo.setHandlerUnitId(handlerUnitIds);
            vo.setHandlerUnitName(handlerUnitNames);

            this.distinctVo(vo);
            return vo;
        }).collect(Collectors.toList());
        result.data(vos);
@@ -1090,6 +1123,7 @@
    /**
     * 查询超时的任务
     *
     * @param projectId 项目id
     * @param processDefinitionId 流程定义id
     * @param processInsId 流程实例id
     * @param taskName 任务名称--搜索条件
@@ -1098,7 +1132,7 @@
     * @param result
     * @return
     */
    private List<CustomerTaskVO> getOvertimeTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
    private List<CustomerTaskVO> getOvertimeTask(Long projectId, String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
        int startNum = pageSize * (pageNum - 1);
        int endNum = startNum + pageSize;

@@ -1139,7 +1173,7 @@
        List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
            Task task = keyMap.get(userTask.getId());
            CustomerTaskVO vo = new CustomerTaskVO();
            this.setRuntimeTaskInfo(task, vo);
            this.setRuntimeTaskInfo(task, vo, projectId);
            return vo;
        }).collect(Collectors.toList());
        result.data(vos);
@@ -1175,6 +1209,7 @@
    /**
     * 查询即将超时的任务
     *
     * @param projectId 项目id
     * @param processDefinitionId 流程定义id
     * @param processInsId 流程实例id
     * @param taskName 任务名称--搜索条件
@@ -1183,7 +1218,7 @@
     * @param result
     * @return
     */
    private List<CustomerTaskVO> getWillOvertimeTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
    private List<CustomerTaskVO> getWillOvertimeTask(Long projectId, String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
        int startNum = pageSize * (pageNum - 1);
        int endNum = startNum + pageSize;

@@ -1224,7 +1259,7 @@
        List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
            Task task = keyMap.get(userTask.getId());
            CustomerTaskVO vo = new CustomerTaskVO();
            this.setRuntimeTaskInfo(task, vo);
            this.setRuntimeTaskInfo(task, vo, projectId);
            return vo;
        }).collect(Collectors.toList());
        result.data(vos);
@@ -1234,6 +1269,7 @@
    /**
     * 查询剩余事项（未开始的任务）
     *
     * @param projectId 项目id
     * @param processDefinitionId
     * @param processInsId
     * @param taskName
@@ -1242,22 +1278,13 @@
     * @param result
     * @return
     */
    private List<CustomerTaskVO> getRemainingTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
        int startNum = pageSize * (pageNum - 1);
        int endNum = startNum + pageSize;
        List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);

        if (startNum >= allUserTaskElement.size()) {
            // 如果起始索引超出了列表的大小，返回一个空列表
            return new ArrayList<>();
        }
        if (StringUtils.isNotBlank(taskName)) {
            // 模拟模糊查询
            allUserTaskElement = allUserTaskElement.stream().filter(taskEl -> taskEl.getName().contains(taskName)).collect(Collectors.toList());
        }
        result.total(allUserTaskElement.size());
        int end = Math.min(endNum, allUserTaskElement.size());
        List<UserTask> userTasks = allUserTaskElement.subList(startNum, end);
    private List<CustomerTaskVO> getRemainingTask(Long projectId,
                                                  String processDefinitionId,
                                                  String processInsId,
                                                  String taskName,
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  Result result) {
        // 查出流程
        ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
        if (Objects.isNull(process)) {
@@ -1267,41 +1294,56 @@
            return vos;
        }

        // 一个任务可能有多个候选人/组，所以需要使用list
        List<Long> handlerIds = new ArrayList<>(2);
        List<String> handlerNames = new ArrayList<>(2);
        List<Long> handlerUnitIds = new ArrayList<>(2);
        List<String> handlerUnitNames = new ArrayList<>(2);
        int startNum = pageSize * (pageNum - 1);
        int endNum = startNum + pageSize;
        List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);

        // 排除进行中的任务和已完成的任务
        List<String> runTaskKeyList = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
        List<String> finishedTaskKeyList = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInsId).finished().list().stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
        allUserTaskElement = allUserTaskElement.stream().filter(el -> !runTaskKeyList.contains(el.getId()) && !finishedTaskKeyList.contains(el.getId())).collect(Collectors.toList());
        // 模拟模糊查询
        if (StringUtils.isNotBlank(taskName)) {
            allUserTaskElement = allUserTaskElement.stream().filter(taskEl -> taskEl.getName().contains(taskName)).collect(Collectors.toList());
        }
        if (startNum >= allUserTaskElement.size()) {
            // 如果起始索引超出了列表的大小，返回一个空列表
            return new ArrayList<>();
        }
        result.total(allUserTaskElement.size());
        int end = Math.min(endNum, allUserTaskElement.size());
        List<UserTask> userTasks = allUserTaskElement.subList(startNum, end);



        // 判断任务状态，构建vo
        List<CustomerTaskVO> vos = new ArrayList<>(48);
        for (UserTask userTask : userTasks) {
            CustomerTaskVO vo = new CustomerTaskVO();
            // 一个任务可能有多个候选人/组，所以需要使用list
            List<Long> handlerIds = new ArrayList<>(2);
            List<String> handlerNames = new ArrayList<>(2);
            List<Long> handlerUnitIds = new ArrayList<>(2);
            List<String> handlerUnitNames = new ArrayList<>(2);
            vo.setHandlerId(handlerIds);
            vo.setHandlerName(handlerNames);
            vo.setHandlerUnitId(handlerUnitIds);
            vo.setHandlerUnitName(handlerUnitNames);

            vo.setProcessInsId(process.getId());
            vo.setProcessDefId(processDefinitionId);
            vo.setDeployId(process.getDeploymentId());
            vo.setTaskName(userTask.getName());
            vo.setProcessName(process.getProcessDefinitionName());
            Task task = taskService.createTaskQuery()
                    .processInstanceId(process.getId())
                    .taskDefinitionKey(userTask.getId())
                    .singleResult();
            if (Objects.isNull(task)) {
                // 如果任务在运行时没找到，那么可能为未开始或者已完成，只查询未开始的
                List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
                        .processInstanceId(process.getProcessInstanceId())
                        .taskDefinitionKey(userTask.getId())
                        .includeIdentityLinks()
                        .orderByHistoricTaskInstanceStartTime()
                        .desc()
                        .list();
                if (CollectionUtils.isEmpty(historicTasks)) {
            vo.setTaskStatus(TaskStatusEnum.NOT_START);
                    // 未开始的任务，其关联的用户组这些都可以从UserTask中拿到，因为本身未开始的任务是没有task的，所以这里直接查
                    if (StringUtils.isNotBlank(userTask.getAssignee())) {
                        vo.setHandlerType(HandlerTypeEnum.USER);

                        // 处理变量表达式
                        if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
                            handlerNames.add(userTask.getAssignee());
                    this.varReview(vo, projectId, processInsId);
                    vos.add(vo);
                            continue;
                        }
                        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
@@ -1338,21 +1380,44 @@
                            }
                        }
                    }
                    vo.setTaskStatus(TaskStatusEnum.NOT_START);
                    vo.setHandlerId(handlerIds);
                    vo.setHandlerName(handlerNames);
                    vo.setHandlerUnitId(handlerUnitIds);
                    vo.setHandlerUnitName(handlerUnitNames);
                } else {
                    continue;
                }
            } else {
                this.setRuntimeTaskInfo(task, vo);
            }
            this.distinctVo(vo);
            vos.add(vo);
        }
        result.data(vos);
        return vos;
    }

    /**
     * 对任务信息中处理人的去重
     *
     * @param vo
     */
    private void distinctVo(CustomerTaskVO vo) {
        vo.setHandlerId(vo.getHandlerId().stream().distinct().collect(Collectors.toList()));
        vo.setHandlerName(vo.getHandlerName().stream().distinct().collect(Collectors.toList()));
        vo.setHandlerUnitId(vo.getHandlerUnitId().stream().distinct().collect(Collectors.toList()));
        vo.setHandlerUnitName(vo.getHandlerUnitName().stream().distinct().collect(Collectors.toList()));
    }

    /**
     * 处理流程变量的处理人回显
     *
     * @param vo
     */
    private void varReview(CustomerTaskVO vo, Long projectId, String processInsId) {
        ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
                .eq(ProjectProcess::getProjectId, projectId)
                .eq(ProjectProcess::getProcessInsId, processInsId)
                .one();
        if (Objects.isNull(projectProcess)) {
            throw new RuntimeException("该流程未绑定项目");
        }
        SysUser user = sysUserService.selectUserById(projectProcess.getDataLaunch());
        if (Objects.nonNull(user) && Objects.nonNull(user.getDept())) {
            vo.getHandlerName().add(user.getDept().getDeptName());
            vo.getHandlerId().add(user.getDept().getDeptId());
        }
        this.distinctVo(vo);
    }

    /**
@@ -1395,6 +1460,10 @@
        List<String> handlerNames = new ArrayList<>(2);
        List<Long> handlerUnitIds = new ArrayList<>(2);
        List<String> handlerUnitNames = new ArrayList<>(2);
        taskVO.setHandlerId(handlerIds);
        taskVO.setHandlerName(handlerNames);
        taskVO.setHandlerUnitId(handlerUnitIds);
        taskVO.setHandlerUnitName(handlerUnitNames);

        // 流程处理人信息
        if (TaskStatusEnum.TODO.equals(taskVO.getTaskStatus())) {
@@ -1476,10 +1545,8 @@
                }
            }
        }
        taskVO.setHandlerId(handlerIds);
        taskVO.setHandlerName(handlerNames);
        taskVO.setHandlerUnitId(handlerUnitIds);
        taskVO.setHandlerUnitName(handlerUnitNames);

        this.distinctVo(taskVO);
    }

    /**