diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserOrgInfo.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserOrgInfo.java index 5e5c1a13d..686cd3f28 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserOrgInfo.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserOrgInfo.java @@ -25,6 +25,12 @@ public class IndexUserOrgInfo { @ChineseDescription("组织机构id") private Long orgId; + /** + * 组织机构所属公司id + */ + @ChineseDescription("组织机构所属公司id") + private Long companyId; + /** * 职务id,组织机构下对应的职务id */ diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index df40d075b..bab5f137d 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -211,6 +211,8 @@ public class UserIndexInfoService { indexUserOrgInfo.setOrgId(userOrgItem.getCompanyId()); } + // 设置公司id + indexUserOrgInfo.setCompanyId(userOrgItem.getCompanyId()); indexUserOrgInfo.setCompanyName(userOrgItem.getCompanyName()); indexUserOrgInfo.setDeptName(userOrgItem.getDeptName());