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 new file mode 100644 index 000000000..46aba4d18 --- /dev/null +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java @@ -0,0 +1,34 @@ +package cn.stylefeng.roses.kernel.sys.modular.login.pojo; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import lombok.Data; + + +/** + * 用户的应用详情信息,用在首页获取用户信息 + * + * @author fengshuonan + * @since 2023/6/19 22:18 + */ +@Data +public class IndexUserAppInfo { + + /** + * 应用id + */ + @ChineseDescription("应用id") + private Long appId; + + /** + * 应用名称 + */ + @ChineseDescription("应用名称") + private String appName; + + /** + * 是否是当前登录用户激活的(选中的) + */ + @ChineseDescription("是否是当前登录用户激活的(选中的)") + private Boolean currentSelectFlag; + +} 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 0e503a749..044eee731 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 @@ -38,7 +38,7 @@ public class UserIndexInfo { * 当前用户的部门和任职信息 */ @ChineseDescription("当前用户的部门和任职信息") - private List userOrgInfo; + private List userOrgInfoList; /** * 当前用户的权限编码集合,包括【菜单编码】和【菜单功能编码】 @@ -47,10 +47,10 @@ public class UserIndexInfo { private Set permissionCodeList; /** - * 当前用户选择的应用id + * 当前用户拥有的应用信息 */ - @ChineseDescription("当前用户选择的应用id") - private Long currentAppId; + @ChineseDescription("当前用户拥有的应用信息") + private List userAppInfoList; /** * 用户菜单集合 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 5db0e9ace..277f32626 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 @@ -123,7 +123,7 @@ public class UserIndexInfoService { // 查询到机构为空,直接返回 if (ObjectUtil.isEmpty(userOrgList)) { - userIndexInfo.setUserOrgInfo(resultUserOrg); + userIndexInfo.setUserOrgInfoList(resultUserOrg); return; } @@ -164,7 +164,7 @@ public class UserIndexInfoService { } // 填充用户组织机构信息 - userIndexInfo.setUserOrgInfo(resultUserOrg); + userIndexInfo.setUserOrgInfoList(resultUserOrg); } /**