Merge branch 'develop' into frontend/timo

This commit is contained in:
Timo Volkmann 2019-04-18 12:49:53 +02:00
commit 28be17404d

View File

@ -15,9 +15,13 @@ public interface UserRepository extends CrudRepository<User, Integer> {
User findByUsername(String username);
@Query(value = "SELECT u.id AS ID, SUBSTRING_INDEX(u.email, '@', 1) AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
"FROM user u, user_info ui\n" +
"WHERE u.id = ui.user_id\n" +
"order by ranking_points_sum DESC", nativeQuery = true)
"FROM user u,\n" +
" user_info ui,\n" +
" user_roles ur\n" +
"WHERE u.id = ui.user_id\n" +
"AND u.id = ur.user_id\n" +
"AND (ur.roles_id = 7 OR ur.roles_id = 8)\n" +
"order by ranking_points_sum DESC;", nativeQuery = true)
List<Object[]> getRankingList();
}