From 9a819fa35464df79a1a8a56e132b3463fac520a7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 07 四月 2024 18:59:08 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..54bd7f9 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
@@ -34,6 +34,7 @@
private String sex;
private String mobile;
+ private String openid;
private Integer companyId;
private Integer areaId;
private Integer cityId;
@@ -44,8 +45,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;
}
@@ -60,11 +62,15 @@
}
loginUserInfo.setRoles(rs);
// 璁剧疆鏉冮檺淇℃伅
+
List<String> pms = new ArrayList<>();
- for (SystemPermission permission : permissions) {
- pms.add(permission.getCode());
+ if(permissions!=null){
+ for (SystemPermission permission : permissions) {
+ pms.add(permission.getCode());
+ }
}
loginUserInfo.setPermissions(pms);
+ loginUserInfo.setCompanyIdList(user.getCompanyIdList());
return loginUserInfo;
}
}
--
Gitblit v1.9.3