diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
index eba788e..5f33c34 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
@@ -29,7 +29,6 @@
 			<div class="page-content">
 				<div class="row">
 					<div class="col-xs-12">
-					
 					<form action="teacher/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
@@ -200,7 +199,7 @@
 				$("#ACCOUT").focus();
 			return false;
 			}
-			if($("#PASSWORD").val()==""){
+			if($("#PASSWORD").val()==""&&${msg == "save2"}){
 				$("#PASSWORD").tips({
 					side:3,
 		            msg:'请输入密码',
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 187cfb2..d38c426 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -222,9 +222,14 @@ public class TeacherController extends BaseController {
 		PageData temp = new PageData();
 		temp.put("TEACHER_ID", n.get("ID").toString());
 		PageData p = coursemanagementService.findByTid(temp);
-		pd.put("PASSWORD",
-				new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
-						.getString("PASSWORD")).toString()); // 密码加密
+		if(pd.getString("PASSWORD").toString().isEmpty()){
+			pd.remove("PASSWORD");
+		}else{
+			pd.put("PASSWORD",
+					new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
+							.getString("PASSWORD")).toString()); // 密码加密
+		}
+		
 		teacherService.edit(pd);
 		pd.put("USER_ID", pd.getString("ID")); // ID 主键
 		pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -236,8 +241,10 @@ public class TeacherController extends BaseController {
 		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
 
 		userService.editU(pd); // 执行保存
-		p.put("SUBJECT_ID", pd.get("SUBJECT_IDS"));
-		coursemanagementService.edit(p);
+		if(p!=null){
+			p.put("SUBJECT_ID", pd.get("SUBJECT_IDS"));
+			coursemanagementService.edit(p);
+		}
 		mv.addObject("msg", "success");
 		mv.setViewName("save_result2");
 		return mv;
@@ -680,6 +687,7 @@ public class TeacherController extends BaseController {
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
 		List<PageData> subjects = subjectService.listAllSchool(pd);
+		pd.put("PASSWORD", "");
 		mv.addObject("subjects", subjects);
 		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);