diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index ec1e039..7c01552 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -185,7 +185,7 @@
 						<p onclick="event.stopPropagation();pagetemplate('${SCHOOL_ID}')">模板设置</p>
 					</li>
 					
-					<li>
+					<li style="display:none">
 						<p onclick="event.stopPropagation();other('${SCHOOL_ID}')">其他配置</p>
 					</li>
 				</ul>
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index b65cf66..7181b35 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -311,6 +311,7 @@
 				sv_homework.ALL_SCORE as PAPER_SCORE,
 				sv_homework.GET_SCORE as AVG_SCORE,
 				sv_homework.HOMEWORK_ID,
+				sv_homework.COMPLETE_DESC,
 				sv_homework.NAME,
 				sv_homework.GET_MAX_SCORE,
 				sv_homeworkreport.STUDNET_NO,
diff --git a/resources/mybatis1/sunvote/TeacherMapper.xml b/resources/mybatis1/sunvote/TeacherMapper.xml
index 4bfec78..d84477d 100644
--- a/resources/mybatis1/sunvote/TeacherMapper.xml
+++ b/resources/mybatis1/sunvote/TeacherMapper.xml
@@ -85,17 +85,39 @@
 		update
 		<include refid="tableName"></include>
 		set 
+		<if test="SCHOOL_ID !=null and SCHOOL_ID">
 			SCHOOL_ID = #{SCHOOL_ID},
+			</if>
+			<if test="NAME !=null and NAME">
 			NAME = #{NAME},
+			</if>
+			<if test="PHONE !=null and PHONE">
 			PHONE = #{PHONE},
+			</if>
+			<if test="SEAT_PHONE !=null and SEAT_PHONE">
 			SEAT_PHONE = #{SEAT_PHONE},
+			</if>
+			<if test="CARD_NO !=null and CARD_NO">
 			CARD_NO = #{CARD_NO},
+			</if>
+			<if test="ACCOUT !=null and ACCOUT">
 			ACCOUT = #{ACCOUT},
+			</if>
+			<if test="PASSWORD !=null and PASSWORD">
 			PASSWORD = #{PASSWORD},
+			</if>
+			<if test="SEX !=null and SEX">
 			SEX = #{SEX},
+			</if>
+			<if test="SUBJECT_IDS !=null and SUBJECT_IDS">
 			SUBJECT_IDS = #{SUBJECT_IDS},
+			</if>
+			<if test="KEYPAD_ID !=null and KEYPAD_ID">
 			KEYPAD_ID = #{KEYPAD_ID},
+			</if>
+			<if test="HEADMASTER !=null and HEADMASTER">
 			HEADMASTER = #{HEADMASTER},
+			</if>
 		ID = ID
 		where 
 		ID = #{ID}
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index e7471bf..18d428d 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -189,6 +189,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		PageData n = teacherService.findById(pd);
 		teacherService.edit(pd);
 		pd.put("USER_ID", pd.getString("ID")); // ID 主键
 		pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -211,6 +212,46 @@ public class TeacherController extends BaseController {
 		mv.setViewName("save_result2");
 		return mv;
 	}
+	
+	
+	/**
+	 * 修改
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/updatePassword", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String updatePassword() throws Exception {
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		PageData n = teacherService.findById(pd);
+		ResponseGson<String> ret = new ResponseGson<String>();
+		if(n.get("PASSWORD").equals(pd.get("OLDPASSWORD"))){
+			teacherService.edit(pd);
+			pd.put("USER_ID", pd.getString("ID")); // ID 主键
+			pd.put("LAST_LOGIN", ""); // 最后登录时间
+			pd.put("IP", ""); // IP
+			pd.put("STATUS", "0"); // 状态
+			pd.put("SKIN", "default");
+			pd.put("RIGHTS", "");
+			pd.put("USERNAME", pd.getString("ACCOUT"));
+			pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
+			pd.put("PASSWORD",
+					new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
+							.getString("PASSWORD")).toString()); // 密码加密
+			
+			if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
+				userService.saveU(pd); // 执行保存
+				FHLOG.save(Jurisdiction.getUsername(),
+						"新增系统用户：" + pd.getString("USERNAME"));
+			}
+			ret.setData("Success");
+		}else{
+			ret.setData("Fail");
+		}
+		return ret.toJson();
+	}
 
 	/**
 	 * 列表
@@ -598,6 +639,7 @@ public class TeacherController extends BaseController {
 		pd = this.getPageData();
 		pd.put("ID", pd.get("TEACHER_ID"));
 		pd = teacherService.findById(pd); // 根据ID读取
+		pd.put("PASSWORD", "");
 		mv.setViewName("sunvote/teacher/teacher_edit3");
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);