fixbug

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

@@ -94,17 +94,20 @@ public class ExamMarkerInfoController extends BaseParameterController {
             			LibraryStatus.MARKED);
             }
             List<MarkerDTO> MarkerDTOs = new ArrayList<MarkerDTO>();
+            Marker marker = markerService.findById(markerId);
             if (examSubjects != null && examSubjects.size() > 0) {
                 // query = markLibraryService.findGroupByQuery(query);
                // query = markLibraryService.getByCondition(query);
                 for (ExamSubject examSubject : examSubjects) {
-                    MarkerDTO markerDTO = new MarkerDTO();
-                    markerDTO.setSubjectCode(examSubject.getCode());
-                    markerDTO.setSubjectName(examSubject.getName());
-                    markerDTO.setMarkedCount(
-                            getMarkedCountByCode(markerId, examSubject.getCode(), LibraryStatus.MARKED));
-                    // markerDTO.setRejectCount(getMarkedCountByCode(markerId,markLibrary.getSubjectCode(),LibraryStatus.BACKED));
-                    MarkerDTOs.add(markerDTO);
+                	if(marker.getExamSubjects().contains(examSubject)){
+                		MarkerDTO markerDTO = new MarkerDTO();
+                		markerDTO.setSubjectCode(examSubject.getCode());
+                		markerDTO.setSubjectName(examSubject.getName());
+                		markerDTO.setMarkedCount(
+                				getMarkedCountByCode(markerId, examSubject.getCode(), LibraryStatus.MARKED));
+                		// markerDTO.setRejectCount(getMarkedCountByCode(markerId,markLibrary.getSubjectCode(),LibraryStatus.BACKED));
+                		MarkerDTOs.add(markerDTO);
+                	}
                 }
             }
             model.addAttribute("query", query);