|
@@ -286,10 +286,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
}
|
|
}
|
|
if(!StringUtils.isEmpty(participation)){
|
|
if(!StringUtils.isEmpty(participation)){
|
|
List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().eq("user_id", participation).select("project_id"));
|
|
List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().eq("user_id", participation).select("project_id"));
|
|
|
|
+ List<Integer> collect;
|
|
if(participationList.size()>0){
|
|
if(participationList.size()>0){
|
|
- List<Integer> collect = participationList.stream().map(Participation::getProjectId).collect(Collectors.toList());
|
|
|
|
- queryWrapper.in("id",collect);
|
|
|
|
|
|
+ collect = participationList.stream().map(Participation::getProjectId).collect(Collectors.toList());
|
|
|
|
+ }else {
|
|
|
|
+ collect=new ArrayList<>();
|
|
|
|
+ collect.add(-1);
|
|
}
|
|
}
|
|
|
|
+ queryWrapper.in("id",collect);
|
|
}
|
|
}
|
|
if (status != null && status != 0) {
|
|
if (status != null && status != 0) {
|
|
queryWrapper.eq("status", status);
|
|
queryWrapper.eq("status", status);
|