From e05adb8da62b72798fe273454d51bb36b2ee72de Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 May 2021 15:56:16 +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/ManageMenuService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
index f696784..d8e1711 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
@@ -28,13 +28,17 @@
@Transactional
Map<String,Object> deleteManageMenu(Map map);
- List<ManageMenu> getAllWithPagingQuery(Map map);
+ List<Map<String,Object>> getAllWithPagingQuery(Map map);
List<ManageMenu> getAllMenus();
- List<ManageMenu> getManageMenuByRoleId(int roleId);
+ List getManageMenuByRoleId(int roleId);
- List<ManageMenu> getManageMenuByNameFuzzy(Map map);
+ List getManageChildMenuByRoleId(int roleId);
+
+ List<Map<String,Object>> getManageMenuByNameFuzzy(Map map);
+
+ List<Map<String,Object>> getManageMenuByParentId(Map map);
List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles);
}
--
Gitblit v1.8.0