diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 7c01552..e813a46 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -60,7 +60,7 @@
 				</p>
 				<ul class="menu_1">
 					<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-						<li onclick="event.stopPropagation();chooseListClass('${var.SCHOOL_ID}','${var.ID}')">
+						<li onclick="event.stopPropagation();chooseListClass('${SCHOOL_ID}','${var.ID}')">
 							<p>${ var.NAME }</p>
 						</li>
 			</c:forEach>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
index 53d45e4..4eec2f5 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -48,14 +48,14 @@
 			      <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
 			      		<option value="">全部</option>
 						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-							<option value="${var.GRADE_ID}" <c:if test="${pd.GRADE_ID==var.GRADE_ID}">selected="true"</c:if>>${var.GNAME}</option>
+							<option value="${var.ID}" <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.NAME}</option>
 						</c:forEach>
 				</select>
 				<label>科目: </label>&nbsp;&nbsp;
 			    <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
 			    		<option value="">全部</option>
 						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
-							<option value="${var.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID==var.SUBJECT_ID}">selected="true"</c:if>>${var.SCNAME}</option>
+							<option value="${var.ID}" <c:if test="${pd.SUBJECT_ID==var.ID}">selected="true"</c:if>>${var.CNAME}</option>
 						</c:forEach>
 				</select>&nbsp;&nbsp;&nbsp;&nbsp;
 				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
index c9adb29..87988d9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -27,6 +27,7 @@
 <body class="no-skin">
 
 	<form action="teacher/listcs.do" method="post" name="Form" id="Form">
+		<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
 		<div class="head_box">
 			<div class="box_header">
 				<div class="head_box_l">
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 1caa796..4b41fe9 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -298,6 +298,7 @@
 			(sv_student.NUMBER * 1),
 			sv_studenttest.STUDENT_ID,
 			sv_testpaper.CREATE_DATE
+			limit 0,20
 	</select>
 	
 	
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 7b3058f..008524f 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -98,7 +98,7 @@ public class V1 extends BaseController {
 	private ClassRosterManager classrosterService;
 
 	@Resource(name = "classtypeService")
-	private ClassTypeManager classtypeService;
+	private ClassTypeManager classtypeService; 
 
 	@Resource(name = "gradeService")
 	private GradeManager gradeService;
@@ -1575,7 +1575,9 @@ public class V1 extends BaseController {
 								}
 							}
 						}
-						testpaperinfoService.batchSave(testInfoPdList);
+						if(testInfoPdList != null && testInfoPdList.size() > 0){
+							testpaperinfoService.batchSave(testInfoPdList);
+						}
 					}
 				} else {
 					testPaperId = listData.get(0).getString("TESTPAPER_ID");
@@ -1700,7 +1702,9 @@ public class V1 extends BaseController {
 							}
 						}
 					}
-					testpaperinfoService.batchSave(testInfoPdList);
+					if(testInfoPdList != null && testInfoPdList.size() > 0){
+						testpaperinfoService.batchSave(testInfoPdList);
+					}
 				}
 				res.setData(testPaperId);
 			} catch (Exception e) {
@@ -2986,7 +2990,9 @@ public class V1 extends BaseController {
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
 				// 2. 根据学生列表生成初始化成绩
-				homeworkReporkService.batchSave(student);
+				if(student != null && student.size() > 0){
+					homeworkReporkService.batchSave(student);
+				}
 			}
 			List<ResultStudent> students = resultHomework.getSTUDENTS();
 			for(ResultStudent student:students){
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 36dc8de..d670a46 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -192,6 +192,7 @@ public class ReportController extends BaseController {
 		}else{
 			mv.setViewName("sunvote/teacher/en_teacher_report_1");
 		}
+		
 		return mv;
 	}
 	
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 53e6fac..5fa16f0 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -282,6 +282,11 @@ public class LoginController extends BaseController {
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"admin");
 					List<PageData> gradeInfos = schoolgradesubjectService.listAllGrade(adminInfos);
+					for(PageData grade : gradeInfos){
+						grade.put("GRADE_ID", grade.get("ID"));
+						grade.put("SCHOOL_ID", adminInfos.get("ID"));
+						grade.put("classInfos", sclassService.listAll(grade));
+					}
 					mv.addObject("gradeInfos", gradeInfos);
 					mv.addObject("adminInfos", adminInfos);
 					mv.addObject("SCHOOL_ID", adminInfos.get("ID"));
