【7.6.0】【sys】【首页用户详情接口】更新获取菜单详情接口，返回更多菜单内容

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);
 
         // 获取功能对应的功能编码集合

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);
 
 }

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