From 213e0b4e538969730fceec0736b79691d35365df Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 19 Jun 2023 22:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9B=B4=E5=A4=9A=E8=8F=9C=E5=8D=95=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/service/UserIndexInfoService.java        |  6 +++++-
 .../sys/modular/menu/service/SysMenuService.java   |  6 ++++--
 .../menu/service/impl/SysMenuServiceImpl.java      | 14 +++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
index 6fb2cfe66..8c32fc7af 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
@@ -11,6 +11,7 @@ import cn.stylefeng.roses.kernel.sys.api.pojo.user.SimpleUserDTO;
 import cn.stylefeng.roses.kernel.sys.api.pojo.user.UserOrgDTO;
 import cn.stylefeng.roses.kernel.sys.modular.login.pojo.IndexUserOrgInfo;
 import cn.stylefeng.roses.kernel.sys.modular.login.pojo.UserIndexInfo;
+import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu;
 import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService;
 import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService;
 import cn.stylefeng.roses.kernel.sys.modular.role.service.SysRoleMenuOptionsService;
@@ -21,6 +22,8 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 获取用户首页信息的业务
@@ -189,7 +192,8 @@ public class UserIndexInfoService {
         HashSet<String> permissionCodeList = new HashSet<>();
 
         // 获取菜单对应的菜单编码集合
-        List<String> menuCodeList = sysMenuService.getMenuCodeList(menuIdList);
+        List<SysMenu> menuInfoList = sysMenuService.getMenuCodeList(menuIdList);
+        Set<String> menuCodeList = menuInfoList.stream().map(SysMenu::getMenuCode).collect(Collectors.toSet());
         permissionCodeList.addAll(menuCodeList);
 
         // 获取功能对应的功能编码集合
diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java
index a4ba603bc..ceb34d3a7 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java
@@ -105,11 +105,13 @@ public interface SysMenuService extends IService<SysMenu> {
     List<SysMenu> getTotalMenuList();
 
     /**
-     * 获取菜单对应的菜单编码
+     * 获取菜单对应的菜单编码，以及菜单id、菜单名称、菜单图标、菜单是否隐藏、菜单激活地址、菜单路由、组件路径、排序信息
+     * <p>
+     * 用在用户登录后，获取用户首页信息接口
      *
      * @author fengshuonan
      * @since 2023/6/19 12:53
      */
-    List<String> getMenuCodeList(List<Long> menuIdList);
+    List<SysMenu> getMenuCodeList(List<Long> menuIdList);
 
 }
\ No newline at end of file
diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java
index b0f743553..02672c8b8 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java
@@ -178,22 +178,22 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     }
 
     @Override
-    public List<String> getMenuCodeList(List<Long> menuIdList) {
+    public List<SysMenu> getMenuCodeList(List<Long> menuIdList) {
 
         if (ObjectUtil.isEmpty(menuIdList)) {
             return new ArrayList<>();
         }
 
         LambdaQueryWrapper<SysMenu> sysMenuLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
         sysMenuLambdaQueryWrapper.in(SysMenu::getMenuId, menuIdList);
-        sysMenuLambdaQueryWrapper.select(SysMenu::getMenuCode);
-        List<SysMenu> list = this.list(sysMenuLambdaQueryWrapper);
 
-        if (ObjectUtil.isEmpty(list)) {
-            return new ArrayList<>();
-        }
+        // 查询指定的菜单内容
+        sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuCode, SysMenu::getMenuName, SysMenu::getAntdvIcon,
+                SysMenu::getAntdvVisible, SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, SysMenu::getAntdvComponent,
+                SysMenu::getMenuSort);
 
-        return list.stream().map(SysMenu::getMenuCode).collect(Collectors.toList());
+        return this.list(sysMenuLambdaQueryWrapper);
     }
 
     @Override