diff --git a/WebContent/jsp/Pager.jsp b/WebContent/jsp/Pager.jsp
index a5e2fec4fbb07f9b0d6d8c6a9b70a67b18617551..41f0ecf8dc54f8c51cd099fdbd62623477ebb26c 100644
--- a/WebContent/jsp/Pager.jsp
+++ b/WebContent/jsp/Pager.jsp
@@ -7,9 +7,9 @@
 				      <ul class="pagination">
 				      	<li class="disabled" ><a href="#">页码${pageInfo.pageNum }/${pageInfo.pages }</a></li> 
 				      					      
-				       <c:if test="${pageInfo.hasPreviousPage}">
-				      	<li><a href="${page_url}?currentPage=1">首页</a></li>
-				        <li><a href="${page_url}?currentPage=${pageInfo.pageNum - 1}">上页</a></li>
+				        <c:if test="${pageInfo.hasPreviousPage}">
+					      	<li><a href="${page_url}?currentPage=1">首页</a></li>
+					        <li><a href="${page_url}?currentPage=${pageInfo.pageNum - 1}">上页</a></li>
 				        </c:if>
 				        
 				        <c:forEach begin="1" end="${pageInfo.pages}" var="i">
@@ -17,8 +17,8 @@
 				        </c:forEach>
 				        
 				        <c:if test="${pageInfo.hasNextPage}">
-				        <li><a href="${page_url}?currentPage=${pageInfo.pageNum + 1}">下页</a></li>
-				        <li><a href="${page_url}?currentPage=${pageInfo.pages}">末页</a></li>
+					        <li><a href="${page_url}?currentPage=${pageInfo.pageNum + 1}">下页</a></li>
+					        <li><a href="${page_url}?currentPage=${pageInfo.pages}">末页</a></li>
 				        </c:if> 
 				      </ul>
 				</nav>
diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp
index af2dc8e4acb5f5a4f98410a7bbe6635881742aa2..8cfddf9c4300bfbd2f168cbb754cf2a95e02d22a 100644
--- a/WebContent/jsp/QueryCourse.jsp
+++ b/WebContent/jsp/QueryCourse.jsp
@@ -36,7 +36,7 @@
         <!-- 导航路径 -->
         <ol class="breadcrumb">
             <li>
-                <a href="#">系统管理</a>
+                <a href="#">课程管理</a>
             </li>
             <li class="active">课程管理</li> 
         </ol>
@@ -60,7 +60,7 @@
 	                  <th>理论学时</th>
 	                  <th>实验学时</th>
 	                  <th>学分</th>
-	                  <th>所属学院</th>
+	                  <th>开课学院</th>
 	                  <th>操作</th>
 	                </tr>
 	              </thead>
@@ -73,7 +73,15 @@
 	                  <td>${course.theoretical }</td>                                
 	                  <td>${course.experiement }</td>                                
 	                  <td>${course.score }</td>                                
-	                  <td>${course.academyid }</td>                                
+	                  <%-- <td>${course.academyid }</td>  --%>
+	                   
+	                  <c:forEach items="${academies}" var="academy">	                  	
+						<c:if test="${academy.id == course.academyid}">
+	                  		<td>${academy.name }</td> 
+	                  	</c:if>
+	                  	<%-- <td>${user.id}</td>  --%>
+	                  </c:forEach>
+	                                                 
 	                  <td>
 	                  	<a href="<%=request.getContextPath()%>/CourseController/toUpdateCourse.action?id=${course.id}">更新</a>
 	                  	<a href="javascript:del(${course.id});">删除</a>
diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class
index 3a84cadef7efb02e5ef3ef15fbadf386b33202be..c85b01125bcf061b8c002431c1f16b6d048292b3 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class and b/build/classes/cn/edu/hrbcu/curriculum/controller/CourseController.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class
index d8cbf6358f2e0970b1af9caf271d1dd0e1465393..5c49412598625585a87fe9910a34629562191003 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class and b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class
index f62a2a6a7adb2e949effd59832b0308e3a94f7dc..9bf5bdb6846ef3eb2465a6f3cd3ea4c25fddb076 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class
index fa6cbc382e1b6c0b9ddb78b350ed263a4e8f9658..67ac549f7a17ab6d6ac341ef541912a5b9d3f684 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class
index 2100363264b77fd11838b20ef81fe353a694a036..f639ffb6f546b646f7e0637acfc38b7e779123c4 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class
index 24487d62231022c5e622a585db420f0fff3dae1f..5a15150af761fdb3ba65e4e435aea3c3a2ed12e5 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class
index 07f6f5ebb99ed2ab870cba55f5164601679d5888..b4caaa9cb029929b48f5c5aabacf9419a12ccaaf 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class
index 794f15cce8db55d7e53fec06ea44d6961adf637f..224f2ce54d8106fe7c543077c188bbcc3fa087f8 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class
index 12ec4f6ee0d3c79cfaac7973a2e4ed0cec4a0c09..46fedea406b9b2eabb40138b3e9d51993da4744f 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class differ
diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class
index 7d62387ac9c09c5e0d3e505a4488599bd340b6d4..a4136f954b89f5684829784039cf7542cf0cde14 100644
Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class differ
diff --git a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
index f9143f9b89aba3a6278098b2f75a6a5d176a90ab..08acefaf652c090d890fad12f01529e948893350 100644
--- a/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
+++ b/src/cn/edu/hrbcu/curriculum/controller/CourseController.java
@@ -12,7 +12,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.github.pagehelper.PageInfo;
 
+import cn.edu.hrbcu.curriculum.pojo.Academy;
 import cn.edu.hrbcu.curriculum.pojo.Course;
+import cn.edu.hrbcu.curriculum.service.AcademyService;
 import cn.edu.hrbcu.curriculum.service.CourseService;
 
 
@@ -21,15 +23,20 @@ import cn.edu.hrbcu.curriculum.service.CourseService;
 public class CourseController {
 	@Autowired
 	CourseService courseService;
+	@Autowired
+	AcademyService academyService;
 	
 	@RequestMapping("/QueryCourse.action")
 	public ModelAndView QueryCourse(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){
-		List<Course> list = new ArrayList<Course>();//courseService.selectCourses(currentPage);
+		List<Course> list = courseService.selectCourses(currentPage);
+		List<Academy> academies = academyService.selectAllAcademy();
+		
 		PageInfo<Course> page = new PageInfo<Course>(list);
 		
 		ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("QueryCourse");
+        modelAndView.setViewName("/jsp/QueryCourse");
         modelAndView.addObject("pageInfo", page);
+        modelAndView.addObject("academies", academies);
         modelAndView.addObject("page_url", "/CurriculumSystemManager/CourseController/QueryCourse.action");
         
 		return modelAndView;
diff --git a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
index 7295c88fabc21ae63f41b044612f21bcc3e090c6..789c0b66178605b9e8b217c08ebd2796b8af0691 100644
--- a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
+++ b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
@@ -3,16 +3,9 @@ package cn.edu.hrbcu.curriculum.controller;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java
index c116f46d057b710ce09d52d813d1d5e120af7246..b85e5ed03b69c0d946dbbe9d507a556def9596c5 100644
--- a/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java
@@ -3,16 +3,16 @@ package cn.edu.hrbcu.curriculum.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.AcademyMapper;
 import cn.edu.hrbcu.curriculum.pojo.Academy;
 import cn.edu.hrbcu.curriculum.pojo.AcademyExample;
-import cn.edu.hrbcu.curriculum.pojo.Course;
-import cn.edu.hrbcu.curriculum.pojo.CourseExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class AcademyServiceImpl  implements AcademyService{
 
 	
diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
index b3b0e782610b0736281bbe8f79726616d0761ea8..451e9dd813d2497187b051964ddda2ab5ff6d94a 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.edu.hrbcu.curriculum.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
@@ -8,10 +9,9 @@ import java.util.List;
 import cn.edu.hrbcu.curriculum.dao.CourseMapper;
 import cn.edu.hrbcu.curriculum.pojo.Course;
 import cn.edu.hrbcu.curriculum.pojo.CourseExample;
-import cn.edu.hrbcu.curriculum.pojo.Curriculum;
-import cn.edu.hrbcu.curriculum.pojo.CurriculumExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class CourseServiceImpl implements  CourseService {
 
 	
diff --git a/src/cn/edu/hrbcu/curriculum/service/CoursemodeService.java b/src/cn/edu/hrbcu/curriculum/service/CoursemodeService.java
index 01fff2bb856f706ced1e6d5393a23bd66f59dd2a..b5d0b8cb0aee4d25026a82fc7e300c0b61cd6de9 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CoursemodeService.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CoursemodeService.java
@@ -1,8 +1,6 @@
 package cn.edu.hrbcu.curriculum.service;
 
-import cn.edu.hrbcu.curriculum.pojo.Academy;
 import cn.edu.hrbcu.curriculum.pojo.Coursemode;
-import cn.edu.hrbcu.curriculum.pojo.Coursetype;
 import java.util.List;
 
 public interface CoursemodeService {
diff --git a/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java
index 10b2d8550c57ff3ab69a87faf08e937624620b57..c541df82e334ca94af7501c5b4559424fb52e65b 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java
@@ -3,16 +3,16 @@ package cn.edu.hrbcu.curriculum.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.CoursemodeMapper;
-import cn.edu.hrbcu.curriculum.pojo.Academy;
-import cn.edu.hrbcu.curriculum.pojo.AcademyExample;
 import cn.edu.hrbcu.curriculum.pojo.Coursemode;
 import cn.edu.hrbcu.curriculum.pojo.CoursemodeExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class CoursemodeServiceImpl implements CoursemodeService{
 
 	
diff --git a/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java
index 40b1a2c2bf23aabab92e78d492853ee92d68fd0e..c82473f7fd72a0b9ff1e2f52b37d86e600cd44fa 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java
@@ -2,16 +2,16 @@ package cn.edu.hrbcu.curriculum.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.CoursetypeMapper;
-import cn.edu.hrbcu.curriculum.pojo.Coursemode;
-import cn.edu.hrbcu.curriculum.pojo.CoursemodeExample;
 import cn.edu.hrbcu.curriculum.pojo.Coursetype;
 import cn.edu.hrbcu.curriculum.pojo.CoursetypeExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class CoursetypeServiceImpl  implements CoursetypeService{
 	
 	@Autowired
diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
index a1d4858c74d6e9e39b20b0d83523c61b6c6129e0..127cc30e0111242e7413125ce6b0ef5e08b250c5 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
@@ -2,6 +2,7 @@ package cn.edu.hrbcu.curriculum.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
@@ -10,6 +11,7 @@ import cn.edu.hrbcu.curriculum.pojo.Curriculum;
 import cn.edu.hrbcu.curriculum.pojo.CurriculumExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class CurriculumServiceImpl implements CurriculumService{
 
 	
diff --git a/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java
index 19f2153666c3fcc3a8ad5365806a0349e36ab117..c848d28c41a0679ad060875944ec157d8ff3ff4e 100644
--- a/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java
@@ -3,16 +3,16 @@ package cn.edu.hrbcu.curriculum.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.ExaminationmethodMapper;
 import cn.edu.hrbcu.curriculum.pojo.Examinationmethod;
 import cn.edu.hrbcu.curriculum.pojo.ExaminationmethodExample;
-import cn.edu.hrbcu.curriculum.pojo.Teachingmethod;
-import cn.edu.hrbcu.curriculum.pojo.TeachingmethodExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class ExaminationmethodServiceImpl implements ExaminationmethodService{
 
 	
diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java
index 975aa1e6badeb4b6617c5aa164ad7fc988a98537..64d7383809b97490225dec2e93c2a3c84409c294 100644
--- a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java
@@ -8,8 +8,6 @@ import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.TbUserMapper;
-import cn.edu.hrbcu.curriculum.pojo.Academy;
-import cn.edu.hrbcu.curriculum.pojo.AcademyExample;
 import cn.edu.hrbcu.curriculum.pojo.TbUser;
 import cn.edu.hrbcu.curriculum.pojo.TbUserExample;
 import cn.edu.hrbcu.utils.Common;
diff --git a/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java
index 6e10852e47a438e2fbca0b9e1d333eb044afd830..8a496901bc75cd136cf66d1ae1f65fe28b224499 100644
--- a/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java
@@ -2,16 +2,16 @@ package cn.edu.hrbcu.curriculum.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 
 import cn.edu.hrbcu.curriculum.dao.TeachingmethodMapper;
-import cn.edu.hrbcu.curriculum.pojo.Academy;
-import cn.edu.hrbcu.curriculum.pojo.AcademyExample;
 import cn.edu.hrbcu.curriculum.pojo.Teachingmethod;
 import cn.edu.hrbcu.curriculum.pojo.TeachingmethodExample;
 import cn.edu.hrbcu.utils.Common;
 
+@Service
 public class TeachingmethodServiceImpl implements TeachingmethodService{
 	@Autowired
 	private TeachingmethodMapper teachingmethodMapper;
diff --git a/src/cn/edu/hrbcu/utils/Common.java b/src/cn/edu/hrbcu/utils/Common.java
index 7a7fe00f2e79b85aa61a4c80dae96b102963e9fe..3fd143442482d323ff8563de4a71cb87c94640e6 100644
--- a/src/cn/edu/hrbcu/utils/Common.java
+++ b/src/cn/edu/hrbcu/utils/Common.java
@@ -1,5 +1,5 @@
 package cn.edu.hrbcu.utils;
 
 public class Common {
-	public static final Integer PAGE_SIZE = 3; 
+	public static final Integer PAGE_SIZE = 10; 
 }