diff --git a/resources/mybatis1/sunvote/HeadmasterMapper.xml b/resources/mybatis1/sunvote/HeadmasterMapper.xml
index f9e53af..c4ca827 100644
--- a/resources/mybatis1/sunvote/HeadmasterMapper.xml
+++ b/resources/mybatis1/sunvote/HeadmasterMapper.xml
@@ -15,6 +15,7 @@
 		SCHOOL_ID,	
 		PERMISSION,	
 		PHONE,	
+		KEYPAD_ID,	
 		HEADMASTER_ID
 	</sql>
 	
@@ -26,6 +27,7 @@
 		#{SCHOOL_ID},	
 		#{PERMISSION},	
 		#{PHONE},	
+		#{KEYPAD_ID},	
 		#{HEADMASTER_ID}
 	</sql>
 	
@@ -59,6 +61,7 @@
 			SCHOOL_ID = #{SCHOOL_ID},
 			PERMISSION = #{PERMISSION},
 			PHONE = #{PHONE},
+			KEYPAD_ID = #{KEYPAD_ID},
 		HEADMASTER_ID = HEADMASTER_ID
 		where 
 		HEADMASTER_ID = #{HEADMASTER_ID}
@@ -74,6 +77,22 @@
 			HEADMASTER_ID = #{HEADMASTER_ID}
 	</select>
 	
+	<!-- 通过ID获取数据 -->
+	<select id="findByUsenameAndPassword" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			<if test="pd.KEYPAD_ID != null and pd.KEYPAD_ID != ''">
+				KEYPAD_ID = #{KEYPAD_ID}
+			</if>
+			<if test="pd.KEYPAD_ID == null or pd.KEYPAD_ID != ''">
+				USERNAME = #{USERNAME} and
+				PASSWORD = #{PASSWORD}
+			</if>
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
diff --git a/resources/mybatis1/sunvote/SClassMapper.xml b/resources/mybatis1/sunvote/SClassMapper.xml
index 224dc68..3bacc0d 100644
--- a/resources/mybatis1/sunvote/SClassMapper.xml
+++ b/resources/mybatis1/sunvote/SClassMapper.xml
@@ -15,6 +15,7 @@
 		CLASS_NAME,	
 		CLASS_CODE,	
 		BASESTATION_ID,	
+		HEADMASTER_ID,	
 		ID
 	</sql>
 	
@@ -26,6 +27,7 @@
 		#{CLASS_NAME},	
 		#{CLASS_CODE},	
 		#{BASESTATION_ID},	
+		#{HEADMASTER_ID},	
 		#{ID}
 	</sql>
 	
@@ -40,6 +42,7 @@
 			CLASS_NAME,	
 			CLASS_CODE,	
 			ID,	
+			HEADMASTER_ID,	
 			BASESTATION_ID
 		) values (
 		#{SCHOOL_ID},	
@@ -48,6 +51,7 @@
 		#{CLASS_NAME},	
 		#{CLASS_CODE},	
 		#{ID},	
+		#{HEADMASTER_ID},	
 		#{BASESTATION_ID}
 		)
 	</insert>
@@ -71,6 +75,7 @@
 			CLASS_NAME = #{CLASS_NAME},
 			CLASS_CODE = #{CLASS_CODE},
 			BASESTATION_ID = #{BASESTATION_ID},
+			HEADMASTER_ID = #{HEADMASTER_ID},
 		ID = #{ID}
 		where 
 		ID = #{ID}
@@ -120,6 +125,9 @@
 		<if test="CLASS_TYPE != null and CLASS_TYPE != ''">
 			and ( CLASS_TYPE = #{CLASS_TYPE} )
 		</if>
+		<if test="HEADMASTER_ID != null and HEADMASTER_ID != ''">
+			and ( HEADMASTER_ID = #{HEADMASTER_ID} )
+		</if>
 		
 	</select>
 	
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 3888421..04e1c84 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -45,6 +45,7 @@ import com.fh.service.sunvote.classtype.ClassTypeManager;
 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
 import com.fh.service.sunvote.event.EventManager;
 import com.fh.service.sunvote.grade.GradeManager;
+import com.fh.service.sunvote.headmaster.HeadmasterManager;
 import com.fh.service.sunvote.homework.HomeworkManager;
 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
 import com.fh.service.sunvote.keypad.KeypadManager;
@@ -149,6 +150,9 @@ public class V1 extends BaseController {
 
 	@Resource(name = "teacherService")
 	private TeacherManager teacherService;
+	
+	@Resource(name="headmasterService")
+	private HeadmasterManager headmasterService;
 
 	@Resource(name = "testpaperinfoService")
 	private TestPaperInfoManager testpaperinfoService;
@@ -213,7 +217,22 @@ public class V1 extends BaseController {
 		if (((pd.containsKey("USERNAME") || (pd.containsKey("ACCOUT") && pd
 				.get("ACCOUT") != null)) && pd.containsKey("PASSWORD"))
 				|| pd.containsKey("KEYPAD_ID")) {
+			PageData eventPd = new PageData();
+			eventPd.put("EVENT_ID", get32UUID());
+			eventPd.put("EVENT_NAME", "login");
+			eventPd.put("EVENT_USER", pd.getString("USERNAME"));
+			eventPd.put("EVENT_TYPE", "0");
+			eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
+			if (pd.getString("CLIENT_ID") != null) {
+				eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
+			} else {
+				eventPd.put("CLIENT_ID", "CLIENT");
+			}
+			eventPd.put("EVENT_IP", getRemoteIp());
+			eventService.save(eventPd);
+			
 			PageData pageData = teacherService.getUserInfo(pd);
+			PageData headerMaster = headmasterService.findByUsenameAndPassword(pd);
 			if (pageData != null && pageData.getString("ID") != null) {
 				pageData.put("PASSWORD", "");// 返回参数中不返回密码
 				PageData pt = new PageData();
@@ -231,23 +250,18 @@ public class V1 extends BaseController {
 
 				pageData.remove("SUBJECT_IDS");
 
-				PageData eventPd = new PageData();
-				eventPd.put("EVENT_ID", get32UUID());
-				eventPd.put("EVENT_NAME", "login");
-				eventPd.put("EVENT_USER", pageData.getString("ID"));
-				eventPd.put("EVENT_TYPE", "0");
-				eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
-				if (pd.getString("CLIENT_ID") != null) {
-					eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
-				} else {
-					eventPd.put("CLIENT_ID", "CLIENT");
-				}
-				eventPd.put("EVENT_IP", getRemoteIp());
-				eventService.save(eventPd);
-
+				
+				pageData.put("role", "teacher");
 				res.setData(pageData);
 				// 填充数据到返回数据中
-			} else {
+			} else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){
+				headerMaster.put("PASSWORD", "");
+				headerMaster.put("role", "headermaster");
+				List<PageData> classInfoList = sclassService.listAll(headerMaster);
+				headerMaster.put("classInfoList", classInfoList);
+				
+				
+			}else{
 				res.set1Error();
 			}
 		} else {
@@ -2469,19 +2483,19 @@ public class V1 extends BaseController {
 	 * @param apiName
 	 */
 	private void event(String apiName) {
-		PageData eventPd = new PageData();
-		eventPd.put("EVENT_ID", get32UUID());
-		eventPd.put("EVENT_NAME", apiName);
-		eventPd.put("EVENT_USER", getUsername());
-		eventPd.put("EVENT_TYPE", "-1");
-		eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
-		eventPd.put("CLIENT_ID", "SERVER");
-		eventPd.put("EVENT_IP", getRemoteIp());
-		try {
-			eventService.save(eventPd);
-		} catch (Exception e) {
-
-		}
+//		PageData eventPd = new PageData();
+//		eventPd.put("EVENT_ID", get32UUID());
+//		eventPd.put("EVENT_NAME", apiName);
+//		eventPd.put("EVENT_USER", getUsername());
+//		eventPd.put("EVENT_TYPE", "-1");
+//		eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
+//		eventPd.put("CLIENT_ID", "SERVER");
+//		eventPd.put("EVENT_IP", getRemoteIp());
+//		try {
+//			eventService.save(eventPd);
+//		} catch (Exception e) {
+//
+//		}
 	}
 
 	static int index = 0;
diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java
index d748f34..7b9e906 100644
--- a/src/com/fh/controller/sunvote/sclass/SClassController.java
+++ b/src/com/fh/controller/sunvote/sclass/SClassController.java
@@ -233,6 +233,30 @@ public class SClassController extends BaseController {
 		return mv;
 	}	
 	
+	/**去修改页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit2")
+	public ModelAndView goEdit2()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = sclassService.findById(pd);	//根据ID读取
+		mv.setViewName("sunvote/sclass/sclass_edit2");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> basestations = basestationService.listAll(pd);
+		mv.addObject("basestations",basestations);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		List<PageData> classTypes = classtypeService.listAll(pd);
+		mv.addObject("classTypes", classTypes);
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
 	 /**批量删除
 	 * @param
 	 * @throws Exception
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 3684fbb..131112e 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -490,6 +490,26 @@ public class TeacherController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	/**
+	 * 去修改页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/goEdit2")
+	public ModelAndView goEdit2() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = teacherService.findById(pd); // 根据ID读取
+		mv.setViewName("sunvote/teacher/teacher_edit2");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools", schools);
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 
 	/**
 	 * 批量删除
diff --git a/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java b/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java
index e4122f0..63070f9 100644
--- a/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java
+++ b/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java
@@ -48,6 +48,12 @@ public interface HeadmasterManager{
 	 */
 	public PageData findById(PageData pd)throws Exception;
 	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByUsenameAndPassword(PageData pd)throws Exception;
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java b/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java
index 4b25a4a..33968f0 100644
--- a/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java
+++ b/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java
@@ -70,6 +70,14 @@ public class HeadmasterService implements HeadmasterManager{
 		return (PageData)dao.findForObject("HeadmasterMapper.findById", pd);
 	}
 	
+	/**通过用户名或密码获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByUsenameAndPassword(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("HeadmasterMapper.findByUsenameAndPassword", pd);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception