From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java | 14 ++++++++++++--
1 files changed, 12 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..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,11 +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<ManageMenu> getManageMenuByNameFuzzy(Map map);
+ List getManageMenuByRoleId(int roleId);
+
+ 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