|
@@ -1165,7 +1165,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
List<ProjectAuditor> auditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().eq("project_id", id));
|
|
List<ProjectAuditor> auditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().eq("project_id", id));
|
|
project.setAuditorList(auditorList);
|
|
project.setAuditorList(auditorList);
|
|
project.setAuditUserIds(auditorList.stream().map(ProjectAuditor::getAuditorId).collect(Collectors.toList()));
|
|
project.setAuditUserIds(auditorList.stream().map(ProjectAuditor::getAuditorId).collect(Collectors.toList()));
|
|
-
|
|
|
|
|
|
+ if(project.getCompanyId()==936){
|
|
|
|
+ ProjectSeparate projectSeparate = projectSeparateMapper.selectById(id);
|
|
|
|
+ project.setProjectSeparate(projectSeparate);
|
|
|
|
+ }
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
msg.data = project;
|
|
msg.data = project;
|
|
|
|
|