From 9dd7d77574a41ebdd4d8cc343c0ad740d26cfef8 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 20 Jun 2023 23:52:07 +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=90permission=E3=80=91=E4=BB=8E=E6=96=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/login/pojo/IndexUserAppInfo.java    |  8 ++++++++
 .../sys/modular/login/pojo/UserIndexInfo.java   | 17 ++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
index 46aba4d18..17ec688d2 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
@@ -3,6 +3,8 @@ package cn.stylefeng.roses.kernel.sys.modular.login.pojo;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 用户的应用详情信息，用在首页获取用户信息
@@ -25,6 +27,12 @@ public class IndexUserAppInfo {
     @ChineseDescription("应用名称")
     private String appName;
 
+    /**
+     * 应用菜单集合
+     */
+    @ChineseDescription("应用菜单集合")
+    private List<IndexUserMenuInfo> menuList;
+
     /**
      * 是否是当前登录用户激活的（选中的）
      */
diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
index 044eee731..dcf0ed949 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
@@ -4,7 +4,6 @@ import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -42,6 +41,8 @@ public class UserIndexInfo {
 
     /**
      * 当前用户的权限编码集合，包括【菜单编码】和【菜单功能编码】
+     * <p>
+     * 一般用在前端用户鉴权，或者按钮的权限判断
      */
     @ChineseDescription("当前用户的权限编码集合，包括【菜单编码】和【菜单功能编码】")
     private Set<String> permissionCodeList;
@@ -52,20 +53,6 @@ public class UserIndexInfo {
     @ChineseDescription("当前用户拥有的应用信息")
     private List<IndexUserAppInfo> userAppInfoList;
 
-    /**
-     * 用户菜单集合
-     */
-    @ChineseDescription("用户菜单集合")
-    private List<IndexUserMenuInfo> menuList;
-
-    /**
-     * 菜单路由和appId的映射关系
-     * <p>
-     * 用在提供前端应用切换的需要
-     */
-    @ChineseDescription("菜单路由和appId的映射关系")
-    private Map<String, Long> menuUrlAppIdMap;
-
     /**
      * 登录人的websocketUrl，用来获取右上角的实时消息
      */