From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 c79f12d..4faa580 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
@@ -1,6 +1,7 @@
package com.doumee.core.model;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.CompanyPermission;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
@@ -33,20 +34,24 @@
private String sex;
private String mobile;
+ private Boolean fixed;
private String openid;
private Integer companyId;
private Integer areaId;
private Integer cityId;
private Integer parentId;
+ //绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鍟嗘埛
private Integer type;
private Company company;
+ private Company showCompany;
private List<String> roles;
private List<String> permissions;
private List<Integer> companyIdList;
private List<Integer> departIdList;
+ private List<CompanyPermission> companyPermissionList;
public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions ) {
if (user == null) {
@@ -56,6 +61,7 @@
LoginUserInfo loginUserInfo = new LoginUserInfo();
BeanUtils.copyProperties(user, loginUserInfo);
loginUserInfo.setCompany(user.getCompany());
+ loginUserInfo.setShowCompany(user.getShowCompany());
// 璁剧疆瑙掕壊淇℃伅
List<String> rs = new ArrayList<>();
for (SystemRole role : roles) {
@@ -72,6 +78,8 @@
}
loginUserInfo.setPermissions(pms);
loginUserInfo.setCompanyIdList(user.getCompanyIdList());
+ loginUserInfo.setDepartIdList(user.getDepartIdList());
+ loginUserInfo.setCompanyPermissionList(user.getCompanyPermissionList());
return loginUserInfo;
}
}
--
Gitblit v1.9.3