fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Marker.java

@@ -91,6 +91,12 @@ public class Marker implements Serializable {
     @Transient
     private boolean reseting;
 
+    /**
+     * 班级数量
+     */
+    @Transient
+    private long classCount;
+
     public Marker() {
     }
 
@@ -277,4 +283,13 @@ public class Marker implements Serializable {
     public void setReseting(boolean reseting) {
         this.reseting = reseting;
     }
+
+    public long getClassCount() {
+        return classCount;
+    }
+
+    public void setClassCount(long classCount) {
+        this.classCount = classCount;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/OperationLog.java

@@ -12,7 +12,6 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import javax.persistence.Transient;
 
 import cn.com.qmth.stmms.common.enums.LogType;
 
@@ -58,9 +57,6 @@ public class OperationLog implements Serializable {
     @Column(name = "ip_address")
     private String ipAddress;
 
-    @Transient
-    private String examName;
-
     public Integer getId() {
         return id;
     }
@@ -149,12 +145,4 @@ public class OperationLog implements Serializable {
         this.marker = marker;
     }
 
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/MarkerClassService.java

@@ -3,7 +3,6 @@ package cn.com.qmth.stmms.biz.exam.service;
 import java.util.List;
 import java.util.Set;
 
-import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.model.MarkerClass;
 
 public interface MarkerClassService {
@@ -14,7 +13,7 @@ public interface MarkerClassService {
 
     void deleteByUserIdAndExamId(int userId, int examId);
 
-    void save(Marker marker, String[] classes);
+    void save(int userId, int examId, String[] classes);
 
     Set<String> findClassNameByUserIdAndExamId(int userId, int examId);
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerClassServiceImpl.java

@@ -10,7 +10,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.stmms.biz.common.BaseQueryService;
 import cn.com.qmth.stmms.biz.exam.dao.MarkerClassDao;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.model.MarkerClass;
 import cn.com.qmth.stmms.biz.exam.service.MarkerClassService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
@@ -26,15 +25,14 @@ public class MarkerClassServiceImpl extends BaseQueryService<MarkerClass> implem
 
     @Transactional
     @Override
-    public void save(Marker marker, String[] classes) {
-        this.deleteByUserIdAndExamId(marker.getUserId(), marker.getExamId());
+    public void save(int userId, int examId, String[] classes) {
+        this.deleteByUserIdAndExamId(userId, examId);
         if (classes != null) {
             for (String className : classes) {
-                MarkerClass m = new MarkerClass(marker.getUserId(), marker.getExamId(), className);
+                MarkerClass m = new MarkerClass(userId, examId, className);
                 markerClassDao.save(m);
             }
         }
-        markerService.save(marker);
     }
 
     @Override
@@ -42,6 +40,7 @@ public class MarkerClassServiceImpl extends BaseQueryService<MarkerClass> implem
         return markerClassDao.countByUserIdAndExamId(userId, examId);
     }
 
+    @Transactional
     @Override
     public void deleteByUserIdAndExamId(int userId, int examId) {
         markerClassDao.deleteByUserIdAndExamId(userId, examId);
@@ -67,6 +66,7 @@ public class MarkerClassServiceImpl extends BaseQueryService<MarkerClass> implem
         return markerClassDao.findByUserIdAndExamIdAndClassName(userId, examId, className);
     }
 
+    @Transactional
     @Override
     public int batchSave(List<MarkerClass> list) {
         markerClassDao.save(list);

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

@@ -123,7 +123,7 @@ public class AnswerCheckController extends BaseExamController {
         result.accumulate("name", student.getName());
         result.accumulate("examNumber", student.getExamNumber());
         result.accumulate("studentCode", student.getStudentCode());
-        result.accumulate("campusName", student.getCampusName());
+        result.accumulate("campusName", StringUtils.trimToEmpty(student.getCampusName()));
         result.accumulate("subjectCode", student.getSubjectCode());
         result.accumulate("subjectName", student.getSubjectName());
         result.accumulate("objectiveScore", student.getObjectiveScore() != null ? student.getObjectiveScore() : 0);
@@ -135,9 +135,8 @@ public class AnswerCheckController extends BaseExamController {
 
         JSONArray array = new JSONArray();
         Map<Integer, String> titles = new HashMap<Integer, String>();
-        List<ExamQuestion> questions = questionService
-                .findByExamAndSubjectAndObjectiveAndPaperType(student.getExamId(), student.getSubjectCode(), true,
-                        student.getPaperType());
+        List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjectiveAndPaperType(
+                student.getExamId(), student.getSubjectCode(), true, student.getPaperType());
         List<String> answers = student.getAnswerList();
         if (questions.isEmpty()) {
             // 未设置客观题或无客观题

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

@@ -16,6 +16,7 @@ import cn.com.qmth.stmms.common.enums.*;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,7 +79,7 @@ public class LibraryController extends BaseExamController {
         if (status != null) {
             query.addStatus(status);
         }
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isEmpty(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         List<MarkGroup> groupList = groupService.findByExamAndSubjectAndStatus(examId, query.getSubjectCode(),

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

@@ -94,21 +94,20 @@ public class MarkerController extends BaseExamController {
         query.orderById();
         if (StringUtils.isNotBlank(query.getLoginName())) {
             User user = userService.findByLoginName(query.getLoginName());
-            query.setUserId(
-                    user != null && user.getSchoolId().equals(wu.getUser().getSchoolId()) ? user.getId() : null);
+            query.setUserId(user != null && user.getSchoolId().equals(wu.getUser().getSchoolId()) ? user.getId() : null);
         }
         query = markerService.findByQuery(query);
         for (Marker marker : query.getResult()) {
             marker.setSubject(subjectService.find(marker.getExamId(), marker.getSubjectCode()));
             MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, marker.getSubjectCode(), false,
-                            group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                    marker.getSubjectCode(), false, group.getNumber()));
             marker.setGroup(group);
             marker.setMarkedCount(markService.markedCount(marker));
             marker.setCurrentCount(markService.applyCount(marker));
             marker.setUser(userService.findById(marker.getUserId()));
             marker.setReseting(lockService.isLocked(LockType.MARKER_RESET, marker.getId()));
+            marker.setClassCount(classService.countByUserIdAndExamId(marker.getUserId(), examId));
         }
         model.addAttribute("query", query);
         model.addAttribute("subjectList", getExamSubject(examId, wu));
@@ -214,24 +213,28 @@ public class MarkerController extends BaseExamController {
                 obj.accumulate("message", "评卷员正在重置");
             }
 
-            //            try {
-            //                lockService.waitlock(LockType.EXAM_SUBJECT, marker.getExamId(), marker.getSubjectCode());
-            //                lockService
-            //                        .waitlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            //                lockService.waitlock(LockType.MARKER, marker.getId());
+            // try {
+            // lockService.waitlock(LockType.EXAM_SUBJECT, marker.getExamId(),
+            // marker.getSubjectCode());
+            // lockService
+            // .waitlock(LockType.GROUP, marker.getExamId(),
+            // marker.getSubjectCode(), marker.getGroupNumber());
+            // lockService.waitlock(LockType.MARKER, marker.getId());
             //
-            //                markService.resetMarker(marker);
-            //                obj.accumulate("success", true);
-            //            } catch (Exception e) {
-            //                log.error("reset marker error", e);
-            //                obj.accumulate("success", false);
-            //                obj.accumulate("message", "重置评卷员失败");
-            //            } finally {
-            //                lockService.unlock(LockType.MARKER, marker.getId());
-            //                lockService
-            //                        .unlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            //                lockService.unlock(LockType.EXAM_SUBJECT, marker.getExamId(), marker.getSubjectCode());
-            //            }
+            // markService.resetMarker(marker);
+            // obj.accumulate("success", true);
+            // } catch (Exception e) {
+            // log.error("reset marker error", e);
+            // obj.accumulate("success", false);
+            // obj.accumulate("message", "重置评卷员失败");
+            // } finally {
+            // lockService.unlock(LockType.MARKER, marker.getId());
+            // lockService
+            // .unlock(LockType.GROUP, marker.getExamId(),
+            // marker.getSubjectCode(), marker.getGroupNumber());
+            // lockService.unlock(LockType.EXAM_SUBJECT, marker.getExamId(),
+            // marker.getSubjectCode());
+            // }
         } else {
             obj.accumulate("success", false);
             obj.accumulate("message", "该评卷员不存在");
@@ -511,14 +514,12 @@ public class MarkerController extends BaseExamController {
     }
 
     @RequestMapping(value = "/class/{markerId}", method = RequestMethod.GET)
-    public String classAdd(@PathVariable Integer markerId, Model model, RedirectAttributes redirectAttributes) {
+    public String classList(@PathVariable Integer markerId, Model model, RedirectAttributes redirectAttributes) {
         Marker marker = markerService.findById(markerId);
         if (marker != null) {
+            marker.setUser(userService.findById(marker.getUserId()));
             model.addAttribute("marker", marker);
-            List<String> classList = studentService.findDistinctClassName(marker.getExamId(), marker.getSubjectCode());
             Set<String> classes = classService.findClassNameByUserIdAndExamId(marker.getUserId(), marker.getExamId());
-            classList.removeAll(classes);
-            model.addAttribute("classList", classList);
             model.addAttribute("classes", classes);
             return "modules/exam/markerClass";
         }
@@ -532,10 +533,24 @@ public class MarkerController extends BaseExamController {
             Model model, RedirectAttributes redirectAttributes) {
         Marker marker = markerService.findById(markerId);
         if (marker != null) {
-            classService.save(marker, classes);
+            classService.save(marker.getUserId(), marker.getExamId(), classes);
             addMessage(redirectAttributes, "保存成功");
-            return "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() + "&groupNumber=" + marker
-                    .getGroupNumber();
+            return "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() + "&groupNumber="
+                    + marker.getGroupNumber();
+        }
+        addMessage(redirectAttributes, "评卷员不存在");
+        return "redirect:/admin/exam/marker";
+    }
+
+    @Logging(menu = "评卷员班级清空", type = LogType.DELETE)
+    @RequestMapping(value = "/class/delete", method = RequestMethod.GET)
+    public String classDelete(@RequestParam Integer markerId, Model model, RedirectAttributes redirectAttributes) {
+        Marker marker = markerService.findById(markerId);
+        if (marker != null) {
+            classService.deleteByUserIdAndExamId(marker.getUserId(), marker.getExamId());
+            addMessage(redirectAttributes, "清空成功");
+            return "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() + "&groupNumber="
+                    + marker.getGroupNumber();
         }
         addMessage(redirectAttributes, "评卷员不存在");
         return "redirect:/admin/exam/marker";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/home/HomeController.java

@@ -4,11 +4,15 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import cn.com.qmth.stmms.admin.utils.SessionExamUtils;
+import cn.com.qmth.stmms.biz.exam.model.Exam;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
@@ -17,14 +21,19 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 @RequestMapping("/admin/home")
 public class HomeController {
 
+    @Autowired
+    private ExamService examService;
+
     @RequestMapping
-    public String index(HttpServletRequest request) {
+    public String index(HttpServletRequest request, Model model) {
         WebUser user = RequestUtils.getWebUser(request);
         if (user.getRole() == Role.SYS_ADMIN) {
             return "modules/sys/sysIndex";
         } else {
             int examId = SessionExamUtils.getExamId(request);
             if (examId > 0) {
+                Exam exam = examService.findById(examId);
+                model.addAttribute("examName", examId + "-" + exam.getName());
                 return "modules/exam/examIndex";
             }
             return "redirect:exam/select";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/log/OperationLogController.java

@@ -1,13 +1,7 @@
 package cn.com.qmth.stmms.admin.log;
 
-import cn.com.qmth.stmms.admin.exam.BaseExamController;
-import cn.com.qmth.stmms.biz.exam.model.OperationLog;
-import cn.com.qmth.stmms.biz.exam.query.OperationLogSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.OperationLogService;
-import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.LogType;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +9,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.exam.query.OperationLogSearchQuery;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
+import cn.com.qmth.stmms.biz.exam.service.OperationLogService;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller
 @RequestMapping("/admin/operation/log")
@@ -34,21 +32,11 @@ public class OperationLogController extends BaseExamController {
     @RequestMapping
     public String list(HttpServletRequest request, Model model, OperationLogSearchQuery query) {
         WebUser wu = RequestUtils.getWebUser(request);
-        if (query.getExamId() == null) {
-            query.setExamId(0);
-        }
+        int examId = getSessionExamId(request);
+        query.setExamId(examId);
         query.setSchoolId(wu.getUser().getSchoolId());
         query.orderByCreateTime();
         query = logService.findByQuery(query);
-        Map<Integer, String> map = new HashMap<Integer, String>();
-        for (OperationLog log : query.getResult()) {
-            String examName = map.get(log.getExamId());
-            if (examName == null && log.getExamId() != null) {
-                map.put(log.getExamId(), examService.findById(log.getExamId()).getName());
-            }
-            log.setExamName(map.get(log.getExamId()));
-        }
-
         model.addAttribute("query", query);
         model.addAttribute("examList", examService.findBySchoolIdAndStatus(wu.getUser().getSchoolId()));
         model.addAttribute("typeList", LogType.values());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserClassController.java

@@ -117,7 +117,7 @@ public class UserClassController extends BaseExamController {
             }
             addMessage(redirectAttributes, "已成功导入" + successNum + " 条 " + failureMsg);
         } catch (Exception e) {
-            log.error("Batch import subject user error!", e);
+            log.error("Batch import user class error!", e);
             addMessage(redirectAttributes, "导入用户班级失败！失败信息：" + e.getMessage());
         }
         return "redirect:/admin/user/list";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/utils/SessionExamUtils.java

@@ -44,7 +44,6 @@ public class SessionExamUtils {
     public static void setExamId(HttpServletRequest request, Exam exam) {
         StmmsSession session = RequestUtils.getSession(request);
         session.setParameter(EXAM_ID_KEY, String.valueOf(exam.getId()));
-        session.setParameter(EXAM_NAME_KEY, exam.getId() + "-" + exam.getName());
         session.setParameter(FORBIDDEN_INFO_KEY, String.valueOf(exam.isForbiddenInfo()));
     }
 }

stmms-web/src/main/webapp/WEB-INF/views/include/trackView.jsp

@@ -51,7 +51,7 @@
                     var pane = $('<div class="tab-pane fade" id="track_' + groupNumber + '" style="overflow: hidden;"><canvas id="track-builder-canvas_' + groupNumber + '"></canvas></div>').appendTo($('#right-track-content'));
                     var canvas = document.getElementById('track-builder-canvas_' + groupNumber);
                     var ctx = canvas.getContext('2d');
-                    buildImages(data.imageServer, group.picUrls, group.pictureConfig, canvas, ctx, group.markTracks, group.markSpecialTagList);
+                    buildImages(data.fileServer, group.picUrls, group.pictureConfig, canvas, ctx, group.markTracks, group.markSpecialTagList);
                 }
                 $('#right-track-nav a:first').trigger('click');
                 imageModal.setContent($('#track-view-content'));

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

@@ -26,7 +26,7 @@
                 <span class="b">准考证：</span><span class="i" id="examNumber"></span><span class="pipe">|</span>
                 <span class="b">学号：</span><span class="i" id="studentCode"></span><span class="pipe">|</span>
                 <span class="b">科目：</span><span class="i" id="subject"></span><span class="pipe">|</span>
-                <span class="b">学习中心：</span><span class="i" id="campusName"></span><span class="pipe">|</span>
+                <!-- <span class="b">学习中心：</span><span class="i" id="campusName"></span><span class="pipe">|</span> -->
                 <span class="b">客观总分：</span><span class="i r" id="objectiveScore"></span><span class="pipe">|</span>
                 <span class="b">主观总分：</span><span class="i r" id="subjectiveScore"></span>
             </div>
@@ -164,7 +164,7 @@
         $('#examNumber').html(student.examNumber);
         $('#studentCode').html(student.studentCode);
         $('#subject').html(student.subjectCode + '_' + student.subjectName);
-        $('#campusName').html(student.campusName);
+       // $('#campusName').html(student.campusName);
         $('#objectiveScore').html(student.objectiveScore);
         $('#subjectiveScore').html(student.subjectiveScore);
 

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

@@ -90,7 +90,14 @@
         <tr>
             <td>${result.subjectCode}</td>
             <td>${result.groupNumber}</td>
-            <td>${result.examNumber}</td>
+            <td>
+            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+	            ${fn:substring(result.examNumber,0,1)}***
+	            </c:if>
+	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+	            ${result.examNumber}
+	            </c:if>
+            </td>
             <td>${result.secretNumber}</td>
             <td>${result.status.name}</td>
             <td>

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

@@ -15,22 +15,19 @@
 		<div class="control-group">
 			<label class="control-label">登录名</label>
 			<div class="controls">
-				${marker.loginName }
+				${marker.user.loginName }
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">班级</label>
 			<div class="controls">
 			<c:forEach items="${classes}" var="result">
-				<input name="classes" type="checkbox" value="${result }" checked/>${result }<br/>
-			</c:forEach>
-			<c:forEach items="${classList}" var="result">
-				<input name="classes" type="checkbox" value="${result }"/>${result }<br/>
+				${result }<br/>
 			</c:forEach>
 			</div>
 		</div>
 		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
+			<a href="${ctx}/admin/exam/marker/class/delete?markerId=${marker.id}" class="btn btn-primary"/>清空全部</a>
 			&nbsp;
 			<a href="${ctx}/admin/exam/marker?subjectCode=${marker.subjectCode}&groupNumber=${marker.groupNumber}" class="btn"/>返回</a>
 		</div>

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

@@ -157,6 +157,7 @@
         <th>已评数量</th>
         <th>正在评卷</th>
         <th>任务数</th>
+        <th>绑定班级</th>
         <th>操作</th>
     </tr>
     </thead>
@@ -179,6 +180,9 @@
             <td>${marker.markedCount}</td>
             <td>${marker.currentCount}</td>
             <td>${marker.topCount}</td>
+            <td><c:if test="${marker.classCount != 0}"><a href="${ctx}/admin/exam/marker/class/${marker.id}">${marker.classCount}</a></c:if>
+            	<c:if test="${marker.classCount == 0}">0</c:if>
+            </td>
             <td>
                 <c:if test="${marker.reseting==true}">
                     正在重置

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

@@ -62,9 +62,23 @@
         <tr>
             <td>${result.subjectCode}-${result.subjectName}</td>
             <td>${result.number}</td>
-            <td>${result.examNumber}</td>
-            <td>${result.id}</td>
-            <td>${result.name}</td>
+            <td>
+            	$<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+	            ${fn:substring(result.examNumber,0,1)}***
+	            </c:if>
+	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+	            ${result.examNumber}
+	            </c:if>
+            </td>
+            <td>${result.secretNumber}</td>
+            <td>
+            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+	            ${fn:substring(result.name,0,1)}**
+	            </c:if>
+	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+	            ${result.name}
+	            </c:if>
+            </td>
             <td>${result.markTime}</td>
             <td>${result.problemType.name}</td>
             <td>

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

@@ -61,7 +61,14 @@
         <tr>
             <td>${result.subjectCode}</td>
             <td>${result.groupNumber}</td>
-            <td>${result.examNumber}</td>
+            <td>
+            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+	            ${fn:substring(result.examNumber,0,1)}***
+	            </c:if>
+	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+	            ${result.examNumber}
+	            </c:if>
+            </td>
             <td>${result.secretNumber}</td>
             <td>${result.markCount}</td>
             <td>

stmms-web/src/main/webapp/WEB-INF/views/modules/log/logList.jsp

@@ -15,14 +15,6 @@
 		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber}"/>
 		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize}"/>
 		<div>
-			<label>考试</label>
-			<select class="input-medium" name="examId" id="enable-select">
-                <option value="0">不限</option>
-                <c:forEach items="${examList}" var="exam">
-                <option value="${exam.id}" <c:if test="${exam.id==query.examId}">selected</c:if>>${exam.name}</option>
-                </c:forEach>
-            </select>
-			&nbsp;
 			<label>登录名</label>
 			<input type="text" name="loginName" value="${query.loginName}"  maxlength="20" class="input-medium"/>
 			&nbsp;
@@ -53,7 +45,6 @@
 				<th>类型</th>
 				<th>登录IP</th>
 				<th>功能</th>
-				<th>考试名称</th>
 				<th>操作时间</th>
 				<th>详情</th>
 			</tr>
@@ -73,7 +64,6 @@
 				<td>${log.type.name}</td>
 				<td>${log.ipAddress}</td>
 				<td>${log.menu}</td>
-				<td>${log.examName}</td>
 				<td>${log.createTime }</td>
 				<td>${log.description }</td>
 			</tr>

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -38,7 +38,7 @@
     <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize}"/>
     <div>
         <label>登录名</label>
-        <input type="text" name="loginName" value="${query.name}" maxlength="20" class="input-small"/>
+        <input type="text" name="loginName" value="${query.loginName}" maxlength="20" class="input-small"/>
         &nbsp;
         <label>来源</label>
         <select class="input-small" name="source" id="source-select">