From 2403c05b27d4ad9ae29b158515b5cf510432fb93 Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Sun, 26 Feb 2017 17:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=94=B9=E4=B8=BA=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/manage/UpmsRoleController.java | 9 ++++++
.../controller/manage/UpmsUserController.java | 9 ++++++
.../webapp/WEB-INF/jsp/manage/role/index.jsp | 29 +++++++++++++++++++
.../webapp/WEB-INF/jsp/manage/user/index.jsp | 29 +++++++++++++++++++
4 files changed, 76 insertions(+)
diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java
index b1b7e7a2..e4e85545 100644
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java
@@ -46,6 +46,15 @@ public class UpmsRoleController extends BaseController {
return "/manage/role/index";
}
+ @ApiOperation(value = "角色授权")
+ @RequiresPermissions("upms:role:permission")
+ @RequestMapping(value = "/permission/{id}", method = RequestMethod.GET)
+ public String permission(@PathVariable("id") int id, ModelMap modelMap) {
+ UpmsRole role = upmsRoleService.selectByPrimaryKey(id);
+ modelMap.put("role", role);
+ return "/manage/role/permission";
+ }
+
@ApiOperation(value = "角色列表")
@RequiresPermissions("upms:role:read")
@RequestMapping(value = "/list", method = RequestMethod.GET)
diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java
index dbc883e1..4e7bf4af 100644
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java
@@ -47,6 +47,15 @@ public class UpmsUserController extends BaseController {
return "/manage/user/index";
}
+ @ApiOperation(value = "用户授权")
+ @RequiresPermissions("upms:user:permission")
+ @RequestMapping(value = "/permission/{id}", method = RequestMethod.GET)
+ public String permission(@PathVariable("id") int id, ModelMap modelMap) {
+ UpmsUser user = upmsUserService.selectByPrimaryKey(id);
+ modelMap.put("user", user);
+ return "/manage/user/permission";
+ }
+
@ApiOperation(value = "用户列表")
@RequiresPermissions("upms:user:read")
@RequestMapping(value = "/list", method = RequestMethod.GET)
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
index 56301254..1668fb86 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
@@ -21,6 +21,7 @@