Merge branch 'stmms_ft_dev' of http://git.qmth.com.cn/luoshi/stmms-ft into stmms_ft_dev

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

@@ -63,10 +63,10 @@ public class LibraryController extends BaseExamController {
         }
         subjectFilter(query, wu);
         List<MarkGroup> groupList = groupService.findByExamAndSubject(examId, query.getSubjectCode());
-        if (groupList.isEmpty()) {
-            return "redirect:/admin/exam/mark";
-        }
-        if (query.getGroupNumber() == 0) {
+//        if (groupList.isEmpty()) {
+//            return "redirect:/admin/exam/mark";
+//        }
+        if (query.getGroupNumber() == 0 && !groupList.isEmpty()) {
             query.setGroupNumber(groupList.get(0).getNumber());
         }
         if (status != null) {

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -164,7 +164,7 @@ $('#group-select').change(function(){
     $('#marker-select').empty();
     $('#marker-select').append('<option value="0">不限</option>');
     $('#marker-select').val('0').trigger('change');
-    if(subjectCode=='' || groupNumber==''){
+    if(subjectCode=='' || groupNumber==''||groupNumber==null){
         return;
     }
     $.post('${ctx}/admin/exam/marker/query', {subjectCode: subjectCode, groupNumber: groupNumber}, function(result){