|
@@ -542,7 +542,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
//获取当前项目的子项目列表,任务分组,任务列表,项目相关维度列表
|
|
//获取当前项目的子项目列表,任务分组,任务列表,项目相关维度列表
|
|
reports.forEach(r->{
|
|
reports.forEach(r->{
|
|
//设置项目名称
|
|
//设置项目名称
|
|
- if(r.getDeptId()!=null){
|
|
|
|
|
|
+ if(r.getDeptId()!=0){
|
|
r.setUserReportDeptName(departmentList.stream().filter(f->f.getDepartmentId().equals(r.getDeptId())).findFirst().get().getDepartmentName());
|
|
r.setUserReportDeptName(departmentList.stream().filter(f->f.getDepartmentId().equals(r.getDeptId())).findFirst().get().getDepartmentName());
|
|
}
|
|
}
|
|
r.setProjectName(allProjectList.stream().filter(p->p.getId().equals(r.getProjectId())).findFirst().get().getProjectName());
|
|
r.setProjectName(allProjectList.stream().filter(p->p.getId().equals(r.getProjectId())).findFirst().get().getProjectName());
|