diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/school_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/school_main.jsp
new file mode 100644
index 0000000..84259b3
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/school/school_main.jsp
@@ -0,0 +1,61 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%
+ String path = request.getContextPath();
+ String basePath = request.getScheme() + "://"
+ + request.getServerName() + ":" + request.getServerPort()
+ + path + "/";
+%>
+
+
+
+
+
+
+
+<%@ include file="../../system/index/top.jsp"%>
+
+
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/foot.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/mybatis1/sunvote/PaperMapper.xml b/resources/mybatis1/sunvote/PaperMapper.xml
index d045209..f5fa075 100644
--- a/resources/mybatis1/sunvote/PaperMapper.xml
+++ b/resources/mybatis1/sunvote/PaperMapper.xml
@@ -156,6 +156,9 @@
and USER_ID = #{pd.USER_ID}
+
+ and SUBJECT_ID = #{pd.SUBJECT_ID}
+
order by CREATE_DATE DESC
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 7da990a..f1e3f31 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -334,6 +334,7 @@ public class V1 extends BaseController {
Page page = new Page();
page.getPd().put("PAPER_TYPE", pd.get("PAPER_TYPE"));
page.getPd().put("USER_ID", pd.get("USER_ID"));
+ page.getPd().put("SUBJECT_ID", pd.get("SUBJECT_ID"));
if (pd.containsKey("CURRENTPAGE")) {
String curpage = pd.getString("CURRENTPAGE");
try {
diff --git a/src/com/fh/controller/sunvote/school/SchoolTreeController.java b/src/com/fh/controller/sunvote/school/SchoolTreeController.java
new file mode 100644
index 0000000..9b63b33
--- /dev/null
+++ b/src/com/fh/controller/sunvote/school/SchoolTreeController.java
@@ -0,0 +1,44 @@
+package com.fh.controller.sunvote.school;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.fh.controller.base.BaseController;
+import com.fh.service.sunvote.school.SchoolManager;
+import com.fh.util.PageData;
+
+@Controller
+@RequestMapping(value="/schooltree")
+public class SchoolTreeController extends BaseController {
+
+
+ @Resource(name="schoolService")
+ private SchoolManager schoolService;
+
+ @RequestMapping(value="/tree")
+ public ModelAndView save() throws Exception{
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ List list = schoolService.listAll(pd);
+
+ // 学校
+ for(PageData schoolPageData : list){
+ // 年级
+
+ // 班级
+
+ //
+
+ }
+
+ mv.setViewName("sunvote/school/school_main");
+ return mv;
+ }
+
+
+}