diff --git a/WebContent/jsp/Header.jsp b/WebContent/jsp/Header.jsp
index 6d53bad3d009fd3271e8e75432d09bf7c4107177..529b8c1d0df2daf91485618ea1f65980f74969f8 100644
--- a/WebContent/jsp/Header.jsp
+++ b/WebContent/jsp/Header.jsp
@@ -54,7 +54,7 @@
data-toggle="dropdown"> 用户管理
diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp
index 8cfddf9c4300bfbd2f168cbb754cf2a95e02d22a..9cdebc46753cd812c559e4dbe4f5f8164336a6bb 100644
--- a/WebContent/jsp/QueryCourse.jsp
+++ b/WebContent/jsp/QueryCourse.jsp
@@ -8,7 +8,7 @@
- 课程列表
+ 用户列表
@@ -36,9 +36,9 @@
-
- 课程管理
+ 用户管理
- - 课程管理
+ - 用户管理
@@ -55,7 +55,7 @@
ID |
- 课程名称 |
+ 登录名 |
课程编码 |
理论学时 |
实验学时 |
@@ -68,7 +68,7 @@
${course.id } |
- ${course.name } |
+ ${course.loginname } |
${course.identifier } |
${course.theoretical } |
${course.experiement } |
diff --git a/WebContent/jsp/QueryTbUser.jsp b/WebContent/jsp/QueryTbUser.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..3f24455c6cedc8472324d588daa7c6dd028f3c60
--- /dev/null
+++ b/WebContent/jsp/QueryTbUser.jsp
@@ -0,0 +1,88 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+
+
+
+
+
+
+ 课程列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ 系统管理
+
+ - 用户管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID |
+ 登录名 |
+
+
+
+
+
+ ${course.id } |
+ ${course.loginname } |
+
+ 更新
+ 删除
+ |
+
+
+
+
+
+
+
+
+
+
添加用户
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java b/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java
index 13e3c13a5f63cb21f85c0b77b25b95b6170691c0..cb232cd21566e3f7d54365c65da76d5bab00847c 100644
--- a/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java
+++ b/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java
@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
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.pojo.TbUser;
import cn.edu.hrbcu.curriculum.service.TbUserService;
@@ -22,11 +25,13 @@ public class TbUserController {
@RequestMapping("/QueryTbUser.action")
public ModelAndView QueryTbUser(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){
- List list = new ArrayList();//courseService.selectCourses(currentPage);
+
+ List list = tbUserService.selectTbUsers(currentPage);
+
PageInfo page = new PageInfo(list);
ModelAndView modelAndView = new ModelAndView();
- modelAndView.setViewName("TbUser");
+ modelAndView.setViewName("/jsp/QueryTbUser");
modelAndView.addObject("pageInfo", page);
modelAndView.addObject("page_url", "/CurriculumSystemManager/TbUserController/QueryTbUser.action");