ting.yin 6 years ago
parent
commit
006b9cc161

+ 8 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -150,7 +150,15 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
             int start = 1;
             int start = 1;
             int end = start + count - 1;
             int end = start + count - 1;
             String randomStr = getRandom();
             String randomStr = getRandom();
+            MarkerSearchQuery query = new MarkerSearchQuery();
+            query.setPageNumber(1);
+            query.setPageSize(Integer.MAX_VALUE);
+            query.setExamId(subject.getExamId());
+            query.setSubjectCode(subject.getCode());
+            query.orderById();
+            query = findByQuery(query);
             Set<Marker> markers = new HashSet<Marker>();
             Set<Marker> markers = new HashSet<Marker>();
+            markers.addAll(query.getResult());
             for (; start <= end; start++) {
             for (; start <= end; start++) {
                 Marker marker = new Marker();
                 Marker marker = new Marker();
                 marker.setExamId(subject.getExamId());
                 marker.setExamId(subject.getExamId());

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/parameter/ExamMarkerController.java

@@ -273,7 +273,7 @@ public class ExamMarkerController extends BaseParameterController {
             		marker.setSubjectCode("-");
             		marker.setSubjectCode("-");
         			marker.setSubjectName("-");
         			marker.setSubjectName("-");
             		list.add(marker);
             		list.add(marker);
-            	}else if(query.getSubjectCode()!=null){
+            	}else if(StringUtils.isNotBlank(query.getSubjectCode())){
             		ExamSubject subject = subjectService.find(examId, query.getSubjectCode());
             		ExamSubject subject = subjectService.find(examId, query.getSubjectCode());
             		marker.setSubjectCode(subject.getCode());
             		marker.setSubjectCode(subject.getCode());
             		marker.setSubjectName(subject.getCode() + "-" + subject.getName());
             		marker.setSubjectName(subject.getCode() + "-" + subject.getName());