当评卷员下科目没有主观题时，登录无法选择该科目

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -2,7 +2,6 @@ package cn.com.qmth.stmms.mark;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -110,11 +109,7 @@ public class MarkController extends BaseController {
             modelAndView.setViewName("modules/mark/subjectSelect");
         }
         modelAndView.addObject("marker", marker);
-        Set<ExamSubject> subjectList = marker.getExamSubjects();
-        for (ExamSubject examSubject : subjectList) {
-			
-		}
-        modelAndView.addObject("subjectList",subjectList);
+        modelAndView.addObject("subjectList",marker.getExamSubjects());
 
         if (StringUtils.isNotBlank(marker.getSubjectCode())) {
             clearCurrentTask(marker);

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelect.jsp

@@ -66,7 +66,9 @@
 						<div class="controls">
 							<select name="subjectCode" id="subject-select">
 							<c:forEach items="${subjectList}" var="subject">
-							<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+								<c:if test="${subject.subjectiveCount > 0}">
+								<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+								</c:if>
 							</c:forEach>
 							</select>
 						</div>

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelectAp.jsp

@@ -66,7 +66,9 @@
 						<div class="controls">
 							<select name="subjectCode" id="subject-select">
 							<c:forEach items="${subjectList}" var="subject">
-							<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+								<c:if test="${subject.subjectiveCount > 0}">
+								<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+								</c:if>
 							</c:forEach>
 							</select>
 						</div>