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/service/impl/ManageMenuServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index e64de85..6c5fcdc 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -58,8 +58,8 @@
return resultMap;
}
if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
- resultMap.put("code", ResponseCodeEnum.MENU_IS_EXPIRE.getCode());
- resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXPIRE.getMsg());
+ resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
} else {
manageMenuMapper.insertOne(manageMenu);
//������������������
@@ -215,6 +215,23 @@
}
@Override
+ public List getManageChildMenuByRoleId(int roleId) {
+ List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByRoleId(roleId);
+ List menuIdList = new ArrayList();
+ Map limitMap = new HashMap();
+ limitMap.put("start", 1);
+ limitMap.put("number", 1);
+ for (ManageMenu manageMenu:manageMenus) {
+ limitMap.put("parent_id", manageMenu.getId());
+ List result = manageMenuMapper.getManageMenuByCondition(limitMap);
+ if (result.size()==0){
+ menuIdList.add(manageMenu.getId());
+ }
+ }
+ return menuIdList;
+ }
+
+ @Override
public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) {
Map limitMap = new HashMap();
limitMap.put("name", map.get("name"));
--
Gitblit v1.8.0