From 8dcbdcb82bb0860381eee4bfea2b3c1bae54b7af Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 16 Jan 2024 16:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=9A=84=E5=85=AC=E5=8F=B8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/sys/modular/login/pojo/IndexUserOrgInfo.java | 6 ++++++ .../sys/modular/login/service/UserIndexInfoService.java | 2 ++ 2 files changed, 8 insertions(+) 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());