From 28de5d860e5983ea00c5b0b2287bf2617fbcf90d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 05 三月 2024 09:33:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/yunyibao
---
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 127f16e..4b4ec6f 100644
--- a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -44,8 +44,9 @@
private List<String> roles;
private List<String> permissions;
+ private List<Integer> companyIdList;
- public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions) {
+ public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions ) {
if (user == null) {
return null;
}
@@ -65,6 +66,7 @@
pms.add(permission.getCode());
}
loginUserInfo.setPermissions(pms);
+ loginUserInfo.setCompanyIdList(user.getCompanyIdList());
return loginUserInfo;
}
}
--
Gitblit v1.9.3