diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
new file mode 100644
index 0000000..011d527
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
@@ -0,0 +1,120 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%
+ String path = request.getContextPath();
+ String basePath = request.getScheme() + "://"
+ + request.getServerName() + ":" + request.getServerPort()
+ + path + "/";
+%>
+
+
+
+
+
+
+<%@ include file="../../system/index/top.jsp"%>
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/foot.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf b/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf
new file mode 100644
index 0000000..3989d07
--- /dev/null
+++ b/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf
diff --git a/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf b/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf
new file mode 100644
index 0000000..dbdb8bd
--- /dev/null
+++ b/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index b6c8968..6dd64b9 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -44,8 +44,8 @@
sv_student.`KEYPAD_ID`
FROM
sv_classroster
- LEFT JOIN sv_term ON sv_classroster.TEAMID = sv_term.TERM_ID
- LEFT JOIN sv_student ON sv_classroster.STUDENT_ID = sv_student.ID
+ inner JOIN sv_term ON sv_classroster.TEAMID = sv_term.TERM_ID
+ inner JOIN sv_student ON sv_classroster.STUDENT_ID = sv_student.ID
WHERE
sv_term.START_DATE < NOW()
AND sv_term.END_DATE > NOW()
diff --git a/src/com/fh/interceptor/UrlFilter.java b/src/com/fh/interceptor/UrlFilter.java
new file mode 100644
index 0000000..f5e1698
--- /dev/null
+++ b/src/com/fh/interceptor/UrlFilter.java
@@ -0,0 +1,33 @@
+package com.fh.interceptor;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class UrlFilter implements Filter {
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void doFilter(ServletRequest arg0, ServletResponse arg1,
+ FilterChain arg2) throws IOException, ServletException {
+
+
+ }
+
+ @Override
+ public void init(FilterConfig arg0) throws ServletException {
+
+ }
+
+
+}