From 1c9fbf6622684406b9b92d99eb98a00303743ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 27 Mar 2026 16:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E6=A0=B9=E6=8D=AE=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/menu/MenuApplicationService.java        | 13 +++++++++++++
 .../product/domain/menu/repository/po/MenuPo.java   |  5 +++--
 .../src/main/resources/mapper/menu/MenuMapper.xml   |  6 +++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

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<MenuPo> 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<Long> 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
     </sql>
 
     <select id="selectMenuList" parameterType="com.linke.product.domain.menu.repository.po.MenuPo" resultMap="MenuResult">
@@ -136,6 +137,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="topOrganizationId != null">
                 and me.top_organization_id = #{topOrganizationId}
             </if>
+            <if test="organizationId != null">
+                and om.organization_id = #{organizationId}
+            </if>
             <if test="moduleIdList != null and moduleIdList.size > 0">
                 and mo.modules_id in
                 <foreach item="modulesId" collection="moduleIdList" open="(" separator="," close=")">
@@ -510,4 +514,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-</mapper>
+</mapper>
\ No newline at end of file