From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 4e07d7d..aeb2b8b 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -1,5 +1,6 @@
package com.doumee.core.model;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
@@ -34,11 +35,40 @@
private Integer memberId;
private Integer type;
private String mobile;
+ private String sessionId;
+
+ private Date loginDate;
private List<String> roles;
private List<String> permissions;
+ private List<Integer> companyIdList;
+ private Company company;
+ //jwt鐧诲綍璁剧疆
+ public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions,Company company,String sessionId) {
+ if (user == null) {
+ return null;
+ }
+ // 鎷疯礉鐢ㄦ埛淇℃伅
+ LoginUserInfo loginUserInfo = new LoginUserInfo();
+ BeanUtils.copyProperties(user, loginUserInfo);
+ loginUserInfo.setCompany(company);
+ // 璁剧疆瑙掕壊淇℃伅
+ List<String> rs = new ArrayList<>();
+ for (SystemRole role : roles) {
+ rs.add(role.getCode());
+ }
+ loginUserInfo.setSessionId(sessionId);
+ loginUserInfo.setRoles(rs);
+ // 璁剧疆鏉冮檺淇℃伅
+ List<String> pms = new ArrayList<>();
+ for (SystemPermission permission : permissions) {
+ pms.add(permission.getCode());
+ }
+ loginUserInfo.setPermissions(pms);
+ return loginUserInfo;
+ }
public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions) {
if (user == null) {
return null;
--
Gitblit v1.9.3