diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 3363f29..afb6ca6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -109,14 +109,15 @@
 									<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
 								</c:if>
 								<c:if test="${var.COMPLETE_COUNT == '1'}">
-									<c:if test="${pd.SCHOOLID ==7}">
+									<c:if test="${pd.SCHOOL_ID =='7'}">
 									<a onclick="homeReport2('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
 									</c:if>
-									<c:if test="${pd.SCHOOLID !=7}">
+									<c:if test="${pd.SCHOOL_ID !='7'}">
 									<a onclick="homeReport('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
 									</c:if>
 									<a onclick="del('${var.HOMEWORK_ID}');" ><img src="static/images/remove.png" /></a>
 								</c:if>
+								</td>
 								
 							</tr>
 							
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
index 871af44..1d57dba 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
@@ -23,7 +23,7 @@
 	<link rel="stylesheet" href="static/css/teach.css" />
 	<link rel="stylesheet" href="static/css/edit.css" />
 	<style>
-		.box_header{position:fixed;top:0;left:0;width:100%;}
+		.box_header{position:fixed;top:0;left:0;width:100%;z-index:999;}
 		#Form{margin-top:102px;}
 		
 	</style>
diff --git a/WebRoot/static/images/view.png b/WebRoot/static/images/view.png
index 96dfd24..720f4f5 100644
--- a/WebRoot/static/images/view.png
+++ b/WebRoot/static/images/view.png
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index 82e03b5..a9b41e8 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -10,7 +10,7 @@
 				async:false,
 				type:"post",
 				success:function(data){
-					console.log(data);
+					console.log(data.data.subjectList);
 					if(data!=null){
 						if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
 							subject_id=data.data.subjectList[0].SUBJECT_ID;
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index cfc5898..d8a1a28 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -242,7 +242,8 @@ public class TeacherController extends BaseController {
 		pd = this.getPageData();
 		PageData n = teacherService.findById(pd);
 		ResponseGson<String> ret = new ResponseGson<String>();
-		if(n.get("PASSWORD").equals(pd.get("OLDPASSWORD"))){
+		String oldPass = new  SimpleHash("SHA-1", n.getString("ACCOUT"), pd.get("OLDPASSWORD")).toString(); 
+		if(n.get("PASSWORD").equals(oldPass)){
 			teacherService.edit(pd);
 			pd.put("USER_ID", pd.getString("ID")); // ID 主键
 			pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -256,6 +257,7 @@ public class TeacherController extends BaseController {
 					new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
 							.getString("PASSWORD")).toString()); // 密码加密
 			userService.editU(pd); // 执行保存
+			teacherService.edit(pd);
 			ret.setData("Success");
 		}else{
 			ret.set5Error();