Subversion Repositories SmartDukaan

Rev

Rev 26802 | Rev 27377 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26802 Rev 26912
Line 838... Line 838...
838 
		} else {
 838 
		} else {
839 
 
 839 
 
840 
			if (!isAdmin) {
 840 
			if (!isAdmin) {
841 
 
 841 
 
842 
				finalPredicate = cb.and(p1, p2);
 842 
				finalPredicate = cb.and(p1, p2);
843 
				query.where(p2);
 843 
				query.where(finalPredicate);
844 
			} else {
 844 
			} else {
845 
				query.where(p1);
 845 
				query.where(p1);
846 
			}
 846 
			}
847 
		}
 847 
		}
848 
		query.orderBy(cb.desc(cb.function("isnull", Boolean.class, scheme.get("expireTimestamp"))));
 848 
		query.orderBy(cb.desc(cb.function("isnull", Boolean.class, scheme.get("expireTimestamp"))));