From 8d449c2b1481d35e7af9cad11e20936b0fbaf07b Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Sun, 26 Feb 2017 01:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E5=A2=9E=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/UpmsPermissionController.java      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java
index 7a532833..1f84bb30 100644
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java
@@ -9,7 +9,10 @@ import com.zheng.upms.common.constant.UpmsResult;
 import com.zheng.upms.common.constant.UpmsResultConstant;
 import com.zheng.upms.dao.model.UpmsPermission;
 import com.zheng.upms.dao.model.UpmsPermissionExample;
+import com.zheng.upms.dao.model.UpmsSystem;
+import com.zheng.upms.dao.model.UpmsSystemExample;
 import com.zheng.upms.rpc.api.UpmsPermissionService;
+import com.zheng.upms.rpc.api.UpmsSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -39,6 +42,9 @@ public class UpmsPermissionController extends BaseController {
     @Autowired
     private UpmsPermissionService upmsPermissionService;
 
+    @Autowired
+    private UpmsSystemService upmsSystemService;
+
     @ApiOperation(value = "权限首页")
     @RequiresPermissions("upms:permission:read")
     @RequestMapping(value = "/index", method = RequestMethod.GET)
@@ -46,20 +52,6 @@ public class UpmsPermissionController extends BaseController {
         return "/manage/permission/index";
     }
 
-    @ApiOperation(value = "菜单权限首页")
-    @RequiresPermissions("upms:permission:read")
-    @RequestMapping(value = "/menu", method = RequestMethod.GET)
-    public String menu() {
-        return "/manage/permission/menu";
-    }
-
-    @ApiOperation(value = "按钮权限首页")
-    @RequiresPermissions("upms:permission:read")
-    @RequestMapping(value = "/button", method = RequestMethod.GET)
-    public String button() {
-        return "/manage/permission/button";
-    }
-
     @ApiOperation(value = "权限列表")
     @RequiresPermissions("upms:permission:read")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -91,7 +83,12 @@ public class UpmsPermissionController extends BaseController {
     @ApiOperation(value = "新增权限")
     @RequiresPermissions("upms:permission:create")
     @RequestMapping(value = "/create", method = RequestMethod.GET)
-    public String create() {
+    public String create(ModelMap modelMap) {
+        UpmsSystemExample upmsSystemExample = new UpmsSystemExample();
+        upmsSystemExample.createCriteria()
+                .andStatusEqualTo((byte) 1);
+        List<UpmsSystem> upmsSystems = upmsSystemService.selectByExample(upmsSystemExample);
+        modelMap.put("upmsSystems", upmsSystems);
         return "/manage/permission/create";
     }
 
-- 
GitLab