garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix query for null parent

Browse Source
This commit is contained in:
Athou
2013-06-04 10:36:56 +02:00
parent 9170030856
commit 283efe108c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
View File

@@ -54,7 +54,12 @@ public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
public List<FeedCategory> findByParent(User user, FeedCategory parent) { public List<FeedCategory> findByParent(User user, FeedCategory parent) {
EasyCriteria<FeedCategory> criteria = createCriteria(); EasyCriteria<FeedCategory> criteria = createCriteria();
criteria.andEquals(FeedCategory_.user.getName(), user); criteria.andEquals(FeedCategory_.user.getName(), user);
criteria.andEquals(FeedCategory_.parent.getName(), parent); if (parent == null) {
criteria.andIsNull(FeedCategory_.parent.getName());
} else {
criteria.andEquals(FeedCategory_.parent.getName(), parent);
}
return criteria.getResultList(); return criteria.getResultList();
} }