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 82795f97e..4e9cba05e 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 @@ -140,6 +140,19 @@ public class MenuApplicationService { return menuDomainService.queryButtonlistById(menuPo); } + public List queryOrgButtonlistById(MenuPo menuPo){ + //获取登录人信息 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + UserPo userPo = loginUser.getUserPo(); + if (userPo != null){ + menuPo.setTopOrganizationId(userPo.getTopOrganizationId()); + menuPo.setOrganizationId(userPo.getOrganizationId()); + } + } + return menuDomainService.queryButtonlistById(menuPo); + } + /** * 根据id查询菜单信息 * diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/po/MenuPo.java b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/po/MenuPo.java index 46c586206..9f8871cd7 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/po/MenuPo.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/po/MenuPo.java @@ -77,6 +77,8 @@ public class MenuPo extends BaseVOEntity implements Serializable { private Long sourceId; @ApiModelProperty(name = "一级组织ID") private Long topOrganizationId; + @ApiModelProperty(name = "组织ID") + private Long organizationId; @ApiModelProperty(name = "一级组织名称") private Long topOrganizationName; @@ -91,5 +93,4 @@ public class MenuPo extends BaseVOEntity implements Serializable { private List moduleIdList; @ApiModelProperty(name = "首页展示标记(1-是,2-否)") private Integer homeShowFlag; -} - +} \ 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 2e49952ab..d8b1fb718 100644 --- a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml @@ -82,6 +82,7 @@ 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