无科目的评卷员导出时科目显示"-"

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

@@ -296,15 +296,21 @@ public class ExamMarkerController extends BaseParameterController {
             query.orderById();
             String fileName = "评卷员数据" + DateUtils.getDate("yyyyMMdd") + ".xlsx";
             query = markerService.findByQuery(query);
+            List<Marker> list = new ArrayList<Marker>();
             for (Marker marker : query.getResult()) {
-                ExamSubject subject = subjectService.find(examId, marker.getSubjectCode());
-                if (subject != null) {
-                    marker.setSubjectName(subject.getCode() + "-" + subject.getName());
-                } else {
-                    marker.setSubjectName(marker.getSubjectCode());
-                }
+            	if(marker.getExamSubjects().size()==0){
+            		marker.setSubjectCode("-");
+        			marker.setSubjectName("-");
+            		list.add(marker);
+            	}else{
+            		for (ExamSubject subject : marker.getExamSubjects()) {
+            			marker.setSubjectCode(subject.getCode());
+            			marker.setSubjectName(subject.getCode() + "-" + subject.getName());
+            			list.add(marker);
+            		}
+            	}
             }
-            new ExportExcel("评卷员数据", Marker.class).setDataList(query.getResult()).write(response, fileName).dispose();
+            new ExportExcel("评卷员数据", Marker.class).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出评卷员失败！" + e.getMessage());

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

@@ -152,7 +152,7 @@
 					</c:if>
 				</c:if>
  				<c:if test="${marker.examSubjects.size() == 0 && marker.subject!=null}">
-					无
+					-
 				</c:if>
 				</td>
 				<td>${marker.loginName}</td>