From 5bacbb17debde58d6ff2581e4a03a866ca009c02 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 31 May 2021 15:33:05 +0800
Subject: [PATCH] 菜单接口合并，查询父菜单列表
---
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 ebe54ef..3b8b6ac 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
@@ -121,17 +121,12 @@
public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
Map<String,Object> parameters = getParametersStartingWith(request,null);
Map<String,Object> resultMap = new HashMap<>();
- if (parameters.get("name") == null || parameters.get("current") == null || parameters.get("size") == null){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return ResultMessage.fail(resultMap);
- }
if (Integer.parseInt(parameters.get("current").toString())<1 || Integer.parseInt(parameters.get("size").toString())<1){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
return ResultMessage.fail(resultMap);
}
- List<Map<String,Object>> re = manageMenuService.getManageMenuByNameFuzzy(parameters);
+ Map<String,Object> re = manageMenuService.getManageMenuByCondition(parameters);
return ResultMessage.ok(re);
}
@@ -192,4 +187,12 @@
List<ManageMenu> result = manageMenuService.getManageChildMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
return ResultMessage.ok(result);
}
+
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @RequestMapping(value = "getManageParentMenu", method = RequestMethod.GET)
+ public ResultMessage getManageParentMenu(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String,Object> result = manageMenuService.getManageParentMenu(parameters);
+ return ResultMessage.ok(result);
+ }
}
--
Gitblit v1.8.0