From 1dfe33c0188ccf379b56f4a7eceaa76537f1fd0f Mon Sep 17 00:00:00 2001
From: yxt_mtl <2049520089@qq.com>
Date: Wed, 31 Jan 2024 11:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B9=E6=8D=AE=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90sid=E8=8E=B7=E5=8F=96=E4=B8=80=E7=BA=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/biz/sysmenu/SysMenuMapper.java     |  8 +++++++
 .../portal/biz/sysmenu/SysMenuMapper.xml      | 22 +++++++++++++++++++
 .../portal/biz/sysmenu/SysMenuService.java    | 15 +++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.java
index 7b0e5b9c8b..ec7bfc1c4b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.java
@@ -74,4 +74,12 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 	int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
 
     List<SysMenu> selectByMenuUrl(String menuUrl);
+
+	/**
+	 * 查询该资源下一级菜单列表
+	 *
+	 * @param sourceSid 资源sid
+	 * @return
+	 */
+	List<SysMenuTreeVo> fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.xml
index e31226f48e..02c89790c3 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuMapper.xml
@@ -63,4 +63,26 @@
     <select id="selectByMenuUrl" resultType="com.yxt.anrui.portal.api.sysmenu.SysMenu">
         select * from sys_menu where menuUrl = #{menuUrl}
     </select>
+    <!--将该资源下的所有一级菜单列表-->
+    <select id="fetchRootMenuBySourceSid"  resultType="com.yxt.anrui.portal.api.sysmenu.SysMenuTreeVo">
+        SELECT menu.NAME              AS NAME,
+        menu.sid               AS sid,
+        menu.sid               AS sid,
+        source.sid   AS sourceSid,
+        menu.sortNo            AS sortNo,
+        menu.pSid              AS pSid,
+        source.sourceName      AS sourceName,
+        menu.sid AS menuRootSid,
+        menu.menuUrl           AS menuUrl,
+        menu.iconUrl           AS iconUrl,
+        menu.pageName          AS pageName,
+        menu.pageUrlRedirect   AS pageUrlRedirect,
+        menu.pageUrl           AS pageUrl,
+        menu.remarks,
+        menu.isEnable
+        FROM sys_menu menu
+        LEFT JOIN sys_source source ON menu.sourceSid = source.sid
+        WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
+        ORDER BY menu.sortNo ASC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuService.java
index 03cefcb364..fda97af2a4 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuService.java
@@ -133,8 +133,9 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
         //查询所有的资源列表
         List<SysMenuTreeVo> sysSourceVos = sysSourceService.listMenuTreeVo();
         for (SysMenuTreeVo s : sysSourceVos) {
-            //根据资源sid查询该资源下的所有单位
-            List<SysMenuTreeVo> sysMenuVoList = sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid());
+            //根据资源sid查询该资源下的所有一级菜单
+            //List<SysMenuTreeVo> sysMenuVoList = sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid());
+            List<SysMenuTreeVo> sysMenuVoList = sysMenuService.fetchRootMenuBySourceSid(s.getSourceSid());
             s.setChildren(sysMenuVoList);
             s.setIsSource("1");
             //判断该资源下的菜单是否有可用的状态
@@ -413,4 +414,14 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
     public List<SysMenu> selectByMenuUrl(String menuUrl) {
         return baseMapper.selectByMenuUrl(menuUrl);
     }
+
+    /**
+     * 根据资源sid查询该资源下的一级菜单列表（yxt_mtl 2024-01-31）
+     *
+     * @param sid 资源sid
+     * @return
+     */
+    public List<SysMenuTreeVo> fetchRootMenuBySourceSid(String sid) {
+        return baseMapper.fetchRootMenuBySourceSid(sid);
+    }
 }
\ No newline at end of file