Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u -r1577a6a33d31161c0eddd4afe2c37e70ce79d88a -r725d88237bd16a01a5ec759f45dba18a00ab340f --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision 1577a6a33d31161c0eddd4afe2c37e70ce79d88a) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision 725d88237bd16a01a5ec759f45dba18a00ab340f) @@ -312,9 +312,9 @@ + sortOrder; final String CONDITION_IF_ANY_USER_PROVIDED = " AND lesson.lessonClass.groupingId = g.grouping.groupingId " - + "AND ug.group.groupId = g.groupId AND ug.user.userId = :userId "; + + "AND ug.groupId = g.groupId AND ug.userId = :userId "; - final String CONDITION_IF_STAFF_PROVIDED = " AND ug.group.groupId = lesson.lessonClass.staffGroup.groupId AND ug.user.userId = :userId "; + final String CONDITION_IF_STAFF_PROVIDED = " AND ug.groupId = lesson.lessonClass.staffGroup.groupId AND ug.userId = :userId "; String queryString; if (sortBy.equals("avgTimeTaken")) {