xiangpei
2025-02-11 7c777b6f9f47ca57193b9e4196fa14fa184abe6c
任务处理人bug
1个文件已修改
37 ■■■■ 已修改文件
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -922,11 +922,11 @@
                taskVO.setHandlerType(HandlerTypeEnum.USER);
                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
                if (Objects.nonNull(sysUser)) {
                    handlerIds.add(sysUser.getUserId());
                    handlerNames.add(sysUser.getNickName());
                    taskVO.getHandlerId().add(sysUser.getUserId());
                    taskVO.getHandlerName().add(sysUser.getNickName());
                    if (Objects.nonNull(sysUser.getDept())) {
                        handlerUnitIds.add(sysUser.getDept().getDeptId());
                        handlerUnitNames.add(sysUser.getDept().getDeptName());
                        taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
                        taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
                    }
                }
                // 绑定的是角色或者部门
@@ -938,16 +938,16 @@
                        // 部门
                        SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
                        if (Objects.nonNull(dept)) {
                            handlerUnitIds.add(dept.getDeptId());
                            handlerUnitNames.add(dept.getDeptName());
                            taskVO.getHandlerUnitId().add(dept.getDeptId());
                            taskVO.getHandlerUnitName().add(dept.getDeptName());
                        }
                    }
                } else {
                    taskVO.setHandlerType(HandlerTypeEnum.ROLE);
                    SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
                    if (Objects.nonNull(role)) {
                        handlerUnitIds.add(Long.parseLong(identityLink.getGroupId()));
                        handlerUnitNames.add(role.getRoleName());
                        taskVO.getHandlerUnitId().add(Long.parseLong(identityLink.getGroupId()));
                        taskVO.getHandlerUnitName().add(role.getRoleName());
                    }
                }
            }
@@ -1102,8 +1102,8 @@
                long handlerUserId = Long.parseLong(hisTask.getAssignee());
                SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                if (Objects.nonNull(handlerUser)) {
                    handlerIds.add(handlerUserId);
                    handlerNames.add(handlerUser.getNickName());
                    vo.getHandlerId().add(handlerUserId);
                    vo.getHandlerName().add(handlerUser.getNickName());
                    vo.setActualHandlerUserId(hisTask.getAssignee());
                    vo.setActualHandlerUserName(handlerUser.getNickName());
                }
@@ -1405,11 +1405,11 @@
                }
                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                if (Objects.nonNull(sysUser)) {
                    handlerIds.add(sysUser.getUserId());
                    handlerNames.add(sysUser.getNickName());
                    vo.getHandlerId().add(sysUser.getUserId());
                    vo.getHandlerName().add(sysUser.getNickName());
                    if (Objects.nonNull(sysUser.getDept())) {
                        handlerUnitIds.add(sysUser.getDept().getDeptId());
                        handlerUnitNames.add(sysUser.getDept().getDeptName());
                        vo.getHandlerUnitId().add(sysUser.getDept().getDeptId());
                        vo.getHandlerUnitName().add(sysUser.getDept().getDeptName());
                    }
                }
            } else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
@@ -1422,17 +1422,16 @@
                            // 部门
                            SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
                            if (Objects.nonNull(dept)) {
                                handlerUnitIds.add(dept.getDeptId());
                                handlerUnitNames.add(dept.getDeptName());
                                vo.getHandlerUnitId().add(dept.getDeptId());
                                vo.getHandlerUnitName().add(dept.getDeptName());
                            }
                        }
                    } else {
                        vo.setHandlerType(HandlerTypeEnum.ROLE);
                        SysRole role = sysRoleService.selectRoleById(Long.parseLong(groupId));
                        if (Objects.nonNull(role)) {
                            handlerUnitIds.add(role.getRoleId());
                            handlerUnitNames.add(role.getRoleName());
                            vo.getHandlerUnitId().add(role.getRoleId());
                            vo.getHandlerUnitName().add(role.getRoleName());
                        }
                    }
                }