From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 3915f76..4c08837 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,11 +28,15 @@
     @Transactional
     Map<String,Object> deleteManageMenu(Map map);
 
-    List<ManageMenu> getAllWithPagingQuery(Map map);
+    List<Map<String,Object>> getAllWithPagingQuery(Map map);
 
     List<ManageMenu> getAllMenus();
 
-    List<ManageMenu> getManageMenuByNameFuzzy(Map map);
+    List getManageMenuByRoleId(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