From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 21 ++++++++++++++++++---
1 files changed, 18 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..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,19 +34,26 @@
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) {
+ public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions ) {
if (user == null) {
return null;
}
@@ -53,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) {
@@ -60,11 +69,17 @@
}
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());
+ loginUserInfo.setDepartIdList(user.getDepartIdList());
+ loginUserInfo.setCompanyPermissionList(user.getCompanyPermissionList());
return loginUserInfo;
}
}
--
Gitblit v1.9.3