From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..0a8a6b5 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
@@ -52,9 +52,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������", notes = "������������")
@@ -70,9 +70,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������", notes = "������������")
@@ -85,9 +85,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������������", notes = "������������������")
@@ -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