diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 4b72092b3..4df9671c6 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java @@ -152,7 +152,7 @@ public class MenuApplicationService { } } } - return menuDomainService.queryButtonlistById(menuPo); + return menuDomainService.queryOrgButtonlistById(menuPo); } /** diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/facade/MenuRepositoryInterface.java b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/facade/MenuRepositoryInterface.java index a3dfa67da..8b40179ef 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/facade/MenuRepositoryInterface.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/facade/MenuRepositoryInterface.java @@ -26,6 +26,8 @@ public interface MenuRepositoryInterface extends IService { public List queryButtonlistById(MenuPo menuPo); + public List queryOrgButtonlistById(MenuPo menuPo); + /** * 查询菜单树集合 * @@ -150,4 +152,4 @@ public interface MenuRepositoryInterface extends IService { * @return */ public List selectListByOrganizationId(MenuPo menuPo); -} +} \ No newline at end of file diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java index ec8460925..0b09521b3 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java @@ -29,6 +29,8 @@ public interface MenuMapper extends BaseMapper { public List queryButtonlistById(MenuPo menuPo); + public List queryOrgButtonlistById(MenuPo menuPo); + /** * 查询菜单树集合 * @@ -154,4 +156,4 @@ public interface MenuMapper extends BaseMapper { @Select("SELECT * FROM custom_auth WHERE menu_id in (SELECT menu_id FROM sys_menu WHERE top_organization_id = #{organizationId})") List getCustomAuthByOrganizationId(@Param("organizationId") Long organizationId); -} +} \ No newline at end of file diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/persistence/MenuRepositoryImpl.java b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/persistence/MenuRepositoryImpl.java index d0406c2d4..4cc4932e7 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/persistence/MenuRepositoryImpl.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/persistence/MenuRepositoryImpl.java @@ -52,6 +52,11 @@ public class MenuRepositoryImpl extends ServiceImpl implements return menuMapper.queryButtonlistById(menuPo); } + @Override + public List queryOrgButtonlistById(MenuPo menuPo){ + return menuMapper.queryOrgButtonlistById(menuPo); + } + /** * 查询菜单树集合 * diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/service/MenuDomainService.java b/mhd_product/src/main/java/com/linke/product/domain/menu/service/MenuDomainService.java index ce1d86b80..28ff35dda 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/service/MenuDomainService.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/service/MenuDomainService.java @@ -53,6 +53,10 @@ public class MenuDomainService { return menuRepositoryImpl.queryButtonlistById(menuPo); } + public List queryOrgButtonlistById(MenuPo menuPo){ + return menuRepositoryImpl.queryOrgButtonlistById(menuPo); + } + /** * 查询菜单前端组件集合 * @@ -821,4 +825,4 @@ public class MenuDomainService { public List getMenuByTenantsId(Long tenantsId, Integer menuShow) { return menuRepositoryImpl.getMenuByTenantsId(tenantsId, menuShow); } -} +} \ No newline at end of file diff --git a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml index d8b1fb718..995195eb3 100644 --- a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml @@ -82,7 +82,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ON me.modules_id = mo.modules_id LEFT JOIN sys_organization so ON me.top_organization_id = so.organization_id AND so.del_flag = 1 - left join ORGANIZATION_MENU om on me.menu_id = om.menu_id + + + + SELECT + me.menu_id, + me.parent_menu_id, + me.modules_id, + mo.modules_name, + me.product_id, + me.menu_client, + me.menu_type, + me.menu_name, + me.menu_show_name, + me.menu_path, + me.micro_service_path, + me.menu_component, + me.menu_redirect_path, + me.menu_icon, + me.menu_sort, + me.menu_avatar, + me.app_location_code, + me.app_location_name, + me.menu_hidden, + me.menu_visible, + me.menu_cache_status, + me.menu_always_show, + me.menu_internal_or_external, + me.menu_remark, + me.menu_linkage, + me.menu_show, + me.menu_perms, + me.create_time, + me.create_by, + me.update_time, + me.update_by, + me.source_id, + me.del_flag, + so.organization_name, + me.top_organization_id, + me.home_show_flag + FROM + sys_menu me + LEFT JOIN + sys_modules mo + ON me.modules_id = mo.modules_id + LEFT JOIN sys_organization so ON me.top_organization_id = so.organization_id + AND so.del_flag = 1 + left join ORGANIZATION_MENU om on me.menu_id = om.menu_id + +