diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
index 722c5a9..cb5693b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
@@ -28,6 +28,7 @@
 	<!-- 检索  -->
 	<form action="coursemanagement/listcs.do" method="post" name="Form"
 		id="Form" style="background:#fff;">
+		<input type="hidden" name="SCHOOL_ID" id="PAPER_ID" value="${pd.SCHOOL_ID}"/>
 		<div class="head_box">
 			<div class="box_header">
 				<div class="head_box_l">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
index e6930bb..6491773 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
@@ -82,7 +82,7 @@
 					</c:choose>
 				</tbody>
 			</table>
-			<div class="footer">
+			<div class="footer" style="width:auto">
 				<div class="creat"></div>
 				<div class="removeAll"></div>
 				<div class="page_box">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
index 035a2d5..828ecc0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -98,7 +98,18 @@
 							</c:choose>
 						</tbody>
 					</table>
+					<div class="footer" style="width:auto">
+			<!-- 	<div class="creat">
+					<input type="button"  onclick="parent.$('.title_time').modal('show');" value="添加老师" />
 				</div>
+				<div class="removeAll">
+					<input type="button" onclick="deleteAll()" value="删除" />
+				</div> -->
+				<div class="page_box">
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+				</div>
+			</div>
+		</div>
 	</form>
 
 
diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 675413c..6efa423 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -150,6 +150,28 @@
 		
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="listCourselistPage" parameterType="page" resultType="pd">
+		SELECT
+			sv_teacher.`NAME`,
+			sv_teacher.`ID` AS TID,
+			sv_sclass.CLASS_NAME,
+			sv_sclass.ID AS CID,
+			sv_subject.CNAME,
+			sv_subject.ID AS SID,
+		SV_COURSEMANAGEMENT.HEAD_MASTER
+		FROM
+			SV_COURSEMANAGEMENT
+		LEFT JOIN sv_sclass ON SV_COURSEMANAGEMENT.CLASS_ID = sv_sclass.ID
+		LEFT JOIN sv_schoolgradesubject ON sv_sclass.GRADE_ID = sv_schoolgradesubject.GRADE_ID
+		AND sv_sclass.SCHOOL_ID = sv_schoolgradesubject.SCHOOL_ID
+		LEFT JOIN sv_teacher ON sv_coursemanagement.TEACHER_ID = sv_teacher.ID
+		LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID
+		WHERE
+			sv_schoolgradesubject.SCHOOL_ID = #{pd.SCHOOL_ID}
+		
+	</select>
+	
 	
 	
 	<!-- 批量删除 -->
diff --git a/resources/mybatis1/sunvote/SubjectMapper.xml b/resources/mybatis1/sunvote/SubjectMapper.xml
index 174ad07..ac752b6 100644
--- a/resources/mybatis1/sunvote/SubjectMapper.xml
+++ b/resources/mybatis1/sunvote/SubjectMapper.xml
@@ -111,6 +111,20 @@
 		</if>
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="listAllSchoollistPage" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		
+		INNER JOIN sv_schoolgradesubject ON sv_subject.ID = sv_schoolgradesubject.SUBJECT_ID
+		WHERE 1 =1 
+		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''">
+			and	sv_schoolgradesubject.SCHOOL_ID = #{pd.SCHOOL_ID}
+		</if>
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index c174df4..c7c3873 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -147,11 +147,12 @@ public class CourseManagementController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/listcs")
-	public ModelAndView listcs() throws Exception{
+	public ModelAndView listcs(Page page) throws Exception{
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		List<PageData>	varList = coursemanagementService.listCourse(pd);	//列出CourseManagement列表
+		page.setPd(pd);
+		List<PageData>	varList = coursemanagementService.listCourse(page);	//列出CourseManagement列表
 		mv.setViewName("sunvote/coursemanagement/coursemanagement_list2");
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
diff --git a/src/com/fh/controller/sunvote/subject/SubjectController.java b/src/com/fh/controller/sunvote/subject/SubjectController.java
index 290de49..27c7cef 100644
--- a/src/com/fh/controller/sunvote/subject/SubjectController.java
+++ b/src/com/fh/controller/sunvote/subject/SubjectController.java
@@ -116,13 +116,14 @@ public class SubjectController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/listcs")
-	public ModelAndView listcs() throws Exception{
+	public ModelAndView listcs(Page page) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"列表Subject");
 		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		List<PageData>	varList = subjectService.listAllSchool(pd);	//列出Subject列表
+		page.setPd(pd);
+		List<PageData>	varList = subjectService.listAllSchool(page);	//列出Subject列表
 		mv.setViewName("sunvote/subject/subject_list2");
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 4c82d8a..09b2496 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -399,12 +399,13 @@ public class TeacherController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/listcs")
-	public ModelAndView listcs() throws Exception {
+	public ModelAndView listcs(Page page) throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Teacher");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		List<PageData> varList = teacherService.listAll(pd); // 列出Teacher列表
+		page.setPd(pd);
+		List<PageData> varList = teacherService.list(page); // 列出Teacher列表
 		mv.setViewName("sunvote/teacher/teacher_list2");
 		mv.addObject("varList", varList);
 		
diff --git a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
index 5a11352..1169195 100644
--- a/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
+++ b/src/com/fh/service/sunvote/coursemanagement/CourseManagementManager.java
@@ -57,6 +57,7 @@ public interface CourseManagementManager{
 	
 	
 	public List<PageData> listCourse(PageData pd)throws Exception;
+	public List<PageData> listCourse(Page pd)throws Exception;
 	
 }
 
diff --git a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
index 3829ab3..f125391 100644
--- a/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
+++ b/src/com/fh/service/sunvote/coursemanagement/impl/CourseManagementService.java
@@ -66,6 +66,11 @@ public class CourseManagementService implements CourseManagementManager{
 		return (List<PageData>)dao.findForList("CourseManagementMapper.listCourse", pd);
 	}
 	
+	@SuppressWarnings("unchecked")
+	public List<PageData> listCourse(Page pd)throws Exception{
+		return (List<PageData>)dao.findForList("CourseManagementMapper.listCourselistPage", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/subject/SubjectManager.java b/src/com/fh/service/sunvote/subject/SubjectManager.java
index 72cb9e5..2b71b73 100644
--- a/src/com/fh/service/sunvote/subject/SubjectManager.java
+++ b/src/com/fh/service/sunvote/subject/SubjectManager.java
@@ -46,6 +46,8 @@ public interface SubjectManager{
 	
 	public List<PageData> listAllSchool(PageData pd)throws Exception;
 	
+	public List<PageData> listAllSchool(Page pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/subject/impl/SubjectService.java b/src/com/fh/service/sunvote/subject/impl/SubjectService.java
index ac0d333..c8e88db 100644
--- a/src/com/fh/service/sunvote/subject/impl/SubjectService.java
+++ b/src/com/fh/service/sunvote/subject/impl/SubjectService.java
@@ -71,6 +71,15 @@ public class SubjectService implements SubjectManager{
 		return (List<PageData>)dao.findForList("SubjectMapper.listAllSchool", pd);
 	}
 	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllSchool(Page pd)throws Exception{
+		return (List<PageData>)dao.findForList("SubjectMapper.listAllSchoollistPage", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception