Merge branch 'Develop' into 'Test'

Develop







See merge request !981

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/PermissionDao.java

@@ -16,7 +16,7 @@ public interface PermissionDao extends CrudRepository<Permission, Long> {
 
     @Query("SELECT p FROM Permission p " +
             "WHERE p.id in " +
-            "(SELECT r2p.permissionId FROM Role2Permission r2p, User2Role u2r, User u " +
-            "WHERE u.id = :userId AND u2r.roleId = r2p.roleId AND u.id = u2r.userId)")
+            "(SELECT r2p.permissionId FROM Role2Permission r2p, User2Role u2r " +
+            "WHERE u2r.roleId = r2p.roleId AND u2r.userId = :userId)")
     List<Permission> findByUserId(@Param("userId") Long userId);
 }