xiangpei
2025-03-04 3cbfc1624bb7a23a4dfa62ec4558578b00be56b3
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -761,7 +761,7 @@
        ProcessLog processLog = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
                .eq(ProcessLog::getTaskId, form.getTaskId())
                .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.SUPERVISE)
                .eq(ProcessLog::getProcessInsId, form.getProcessInsId())
                .eq(ProcessLog::getProcessInsId, task.getProcessInstanceId())
                .one();
        List<SuperviseData> dataList;
        if (processLog != null) {
@@ -778,7 +778,7 @@
                processLog.getId(),
                processLog.getUserId(),
                form.getProjectId(),
                form.getProcessInsId(),
                task.getProcessInstanceId(),
                form.getTaskId(),
                task.getTaskDefinitionKey(),
                task.getName(),
@@ -1053,14 +1053,16 @@
                    vo.setCreateTime(historicTasks.get(0).getStartTime());
                    // 查询实际处理人
                    long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
                    SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                    if (Objects.nonNull(handlerUser)) {
                        handlerIds.add(handlerUserId);
                        handlerNames.add(this.getUserShowName(handlerUser));
                        if (Objects.nonNull(handlerUser.getDept())) {
                            handlerUnitNames.add(handlerUser.getDept().getDeptName());
                            handlerUnitIds.add(handlerUser.getDept().getDeptId());
                    if (StringUtils.isNotBlank(historicTasks.get(0).getAssignee())) {
                        long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
                        SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                        if (Objects.nonNull(handlerUser)) {
                            handlerIds.add(handlerUserId);
                            handlerNames.add(this.getUserShowName(handlerUser));
                            if (Objects.nonNull(handlerUser.getDept())) {
                                handlerUnitNames.add(handlerUser.getDept().getDeptName());
                                handlerUnitIds.add(handlerUser.getDept().getDeptId());
                            }
                        }
                    }
                    vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());