Merge branch 'Test' of http://git.mooctest.net/summer/main-site into Test

# Conflicts:
#	mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/RoleLogic.java
#	mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/RoleLogicImpl.java
fix lint

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/ThemeController.java

@@ -433,8 +433,9 @@ public class ThemeController extends BaseSearchController {
         Map<String, String> excludeCondition;
 
         if(searchConditionVO.getColumnFilters()==null){
-            if(!roleLogic.isAdmin(userId))
+            if(!roleLogic.isAdmin(userId)) {
                 throw new HttpForbiddenException(String.format("Cannot list all courses, userId: %s", userId));
+            }
             extraCondition = new HashMap<>();
             excludeCondition = new HashMap<>();
         } else{