From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/controller/RoleController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/RoleController.java b/src/main/java/com/moral/controller/RoleController.java
index a69b41b..ab29c8c 100644
--- a/src/main/java/com/moral/controller/RoleController.java
+++ b/src/main/java/com/moral/controller/RoleController.java
@@ -72,4 +72,18 @@
return resultBean;
}
+ @PostMapping("allot-menu/{id}")
+ public ResultBean allotMenu(@PathVariable("id") Integer roleId, @RequestBody Integer [] menuOrders){
+ ResultBean resultBean = new ResultBean();
+ if(roleId==null){
+ resultBean.setCode(ResultBean.NO_PERMISSION);
+ resultBean.setMessage("������ID���������null");
+ return resultBean;
+ }else{
+ roleService.allotMenu(roleId,menuOrders);
+ resultBean.setCode(ResultBean.SUCCESS);
+ }
+ return resultBean;
+ }
+
}
--
Gitblit v1.8.0