fix

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

@@ -111,6 +111,8 @@ public class InspectedController extends BaseExamController {
 
     public static final String UN_SELECTIVE_SCORE = "-1";
 
+    private static final String DEFAULT_SECRET_NUMBER = "***";
+
     @RequestMapping(value = "/list")
     public String list(Model model, HttpServletRequest request, InspectQuery query,
             @RequestParam(required = false) SubjectiveStatus status,
@@ -775,6 +777,9 @@ public class InspectedController extends BaseExamController {
                 mainEndScore, selectiveStatus);
         for (ExamStudentVo e : list) {
             e.setSubjectiveScoreList(e.getSubjectiveScoreList().replace(UN_SELECTIVE_SCORE, "/"));
+            if (exam.isForbiddenInfo() && !Role.SCHOOL_ADMIN.equals(wu.getRole())) {
+                e.setSecretNumber(DEFAULT_SECRET_NUMBER);
+            }
         }
         int maxInspectRound = 1;
         if (list != null && list.size() > 0) {

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

@@ -49,7 +49,7 @@
 		</div>
 		<div class="form-actions">
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+			<a href="${ctx}/admin/exam/collationLabel?examId=${examId}" class="btn">返 回</a>
 		</div>
 	</form:form>
 </body>

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

@@ -48,7 +48,7 @@
 		</div>
 		<div class="form-actions">
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+			<a href="${ctx}/admin/exam/collationLabel?examId=${examId}" class="btn">返 回</a>
 		</div>
 	</form:form>
 </body>