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/mapper/ManageMenuMapper.java | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java index ddb40aa..2258c82 100644 --- a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java +++ b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java @@ -17,25 +17,8 @@ * @since 2021-03-09 */ public interface ManageMenuMapper extends BaseMapper<ManageMenu> { - /** - * @Description: ������������������������������������ - * @Param: [roles] - * @return: java.util.List<com.moral.api.entity.ManageMenu> - * @Author: ��������� - * @Date: 2021/3/10 - */ - List<ManageMenu> getParentMenuByRoles(List<ManageRole> roles); - /** - * @Description: ��������������������������������������� - * @Param: - * @return: - * @Author: ��������� - * @Date: 2021/3/10 - */ - List<ManageMenu> getChildrenByParentId(Integer parentId); - - List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles); + List<ManageMenu> getAllMenusByRoles(List<ManageRole> roles); ManageMenu getManageMenuByName(String name); @@ -45,4 +28,16 @@ void updateManageMenuById(Map map); + List<ManageMenu> getDataWithPage(Map map); + + List<ManageMenu> getAll(); + + List<ManageMenu> getManageRoleByNameFuzzy(Map map); + + List<ManageMenu> getManageMenuByNameFuzzy(Map map); + + List<ManageMenu> getManageMenuByCondition(Map map); + + List<ManageMenu> getManageMenuByRoleId(int roleId); + } -- Gitblit v1.8.0