From 616dca8f5bbb17f0b3a124340965c0232fdae894 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 25 Apr 2021 10:32:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
index c4f87db..ebe54ef 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -30,7 +30,7 @@
 @Slf4j
 @Api(tags = {"������"})
 @RestController
-@RequestMapping("/menu")
+@RequestMapping("/manageMenu")
 public class ManageMenuController {
 
     @Autowired
@@ -181,4 +181,15 @@
         List<Map<String,Object>> re = manageMenuService.getManageMenuByParentId(parameters);
         return ResultMessage.ok(re);
     }
+
+    @ApiOperation(value = "������roleId������������", notes = "������roleId������������")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roleId", value = "������id", required = true, paramType = "query", dataType = "int")
+    })
+    @RequestMapping(value = "getManageChildMenuByRoleId", method = RequestMethod.GET)
+    public ResultMessage getManageChildMenuByRoleId(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<ManageMenu> result = manageMenuService.getManageChildMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
+        return ResultMessage.ok(result);
+    }
 }

--
Gitblit v1.8.0