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/service/ManageMenuService.java | 12 ++++++++++--
1 files changed, 10 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 df78a6e..5c67807 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,21 @@
@Transactional
Map<String,Object> deleteManageMenu(Map map);
- List<ManageMenu> getAllWithPagingQuery(Map map);
+ List<Map<String,Object>> getAllWithPagingQuery(Map map);
List<ManageMenu> getAllMenus();
List getManageMenuByRoleId(int roleId);
- List<ManageMenu> getManageMenuByNameFuzzy(Map map);
+ List getManageChildMenuByRoleId(int roleId);
+
+ List<Map<String,Object>> getManageMenuByNameFuzzy(Map map);
+
+ Map<String,Object> getManageMenuByCondition(Map map);
+
+ Map<String,Object> getManageParentMenu(Map map);
+
+ List<Map<String,Object>> getManageMenuByParentId(Map map);
List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles);
}
--
Gitblit v1.8.0