diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index ef8ca86..ec1e039 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -160,19 +160,10 @@
 						<p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
 					</li>
 					<li>
-						<p id="jishice_paper">作业管理</p>
+						<p id="homework_paper">作业管理</p>
 					</li>
 					<li>
-						<p>作业分析</p>
-						<ul class="menu_2">
-						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-							<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
-								<li onclick="event.stopPropagation();report2('${var1.ID}')">
-									<p>${ var1.CLASS_NAME }</p>
-								</li>
-							</c:forEach>
-						</c:forEach>
-						</ul>
+						<p id="homework_analysis">作业分析</p>
 					</li>
 				</ul>
 		</div>
@@ -410,6 +401,19 @@
 			window.top.loading.show();
 		});
 		
+		$("#homework_paper").click(function (){
+			var path = "../homework/list.do?school_id=" + schoolId ;
+			//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
+			$("#mainFrame").attr('src',path);
+			window.top.loading.show();
+		});
+		$("#homework_analysis").click(function (){
+			var path = "../homework/report.do?school_id=" + schoolId ;
+			//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
+			$("#mainFrame").attr('src',path);
+			window.top.loading.show();
+		});
+		
 		$("#new_paper").click(function (){
 			var path = "../paper/list5.do?school_id=" + schoolId ;
 			//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 7857a30..f306b6c 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -125,6 +125,9 @@ public class HomeworkController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
+		if(pd.get("TEACHER_ID") == null){
+			pd.put("TEACHER_ID", getTeacherID());
+		}
 		pd = this.getPageData();
 		String keywords = pd.getString("keywords"); // 关键词检索条件
 		if (null != keywords && !"".equals(keywords)) {
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index fc1a047..e7471bf 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -186,9 +186,6 @@ public class TeacherController extends BaseController {
 	@RequestMapping(value = "/edit2")
 	public ModelAndView edit2() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "修改Teacher");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
-			return null;
-		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -599,6 +596,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("ID", pd.get("TEACHER_ID"));
 		pd = teacherService.findById(pd); // 根据ID读取
 		mv.setViewName("sunvote/teacher/teacher_edit3");
 		List<PageData> schools = schoolService.listAll(pd);
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 863d187..833465c 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -265,7 +265,7 @@ public class LoginController extends BaseController {
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
 					if(pd.get("DEFAULTURL") == null){
-						pd.put("DEFAULTURL", "../paper/list2.do");
+						pd.put("DEFAULTURL", "../homework/list.do");
 					}
 					mv.addObject("pd", pd);
 					return mv;