DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

return size 0 if no projects found

Browse Source
This commit is contained in:
fred-fri 2012-07-25 11:58:36 +09:00
parent 4a7d26e077
commit 567600307f
1 changed files with 9 additions and 3 deletions

12
src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java

@ -94,9 +94,13 @@ public class ProjectServiceImpl extends AbstractQueryService<Project, Long> impl
if (role!=null){
List<ProjectFollower> pf = projectFollowerService.findByFollowerAndRole(member, role);
return projectRepo.count(isProjectFollower(pf).and(hasStatus(status)).and(hasProjectClass(projectClasses)));
if (!pf.isEmpty())
return projectRepo.count(isProjectFollower(pf).and(hasStatus(status)).and(hasProjectClass(projectClasses)));
else return new Long(0);
} else {
return projectRepo.count(isHeadSupervisor(employee).and(hasStatus(status)).and(hasProjectClass(projectClasses)));
if (employee != null)
return projectRepo.count(isHeadSupervisor(employee).and(hasStatus(status)).and(hasProjectClass(projectClasses)));
else return null;
}
@ -251,7 +255,9 @@ public class ProjectServiceImpl extends AbstractQueryService<Project, Long> impl
}
private BooleanExpression isHeadSupervisor(Employee emp) {
return QProject.project.headSupervisor.eq(emp);
if (emp != null)
return QProject.project.headSupervisor.eq(emp);
else return null;
}