dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dyf-device'

Browse Source
This commit is contained in:
daiyongfei
2025-07-04 08:34:52 +08:00
parent c3a9f4a365 e8aee3039a
commit 3129db352e
55 changed files with 2400 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java
View File

@ -157,6 +157,11 @@ public class SysLoginService {
loginUser.setUsername(user.getUserName());
loginUser.setNickname(user.getNickName());
loginUser.setUserType(user.getUserType());
// 用户级别
loginUser.setUserLevel(user.getUserLevel());
// pid
loginUser.setPid(user.getPid());
loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
loginUser.setRolePermission(permissionService.getRolePermission(userId));
if (ObjectUtil.isNotNull(user.getDeptId())) {
@ -242,7 +247,7 @@ public class SysLoginService {
log.info("登录租户：{} 已被停用.", tenantId);
throw new TenantException("tenant.blocked");
} else if (ObjectUtil.isNotNull(tenant.getExpireTime())
&& new Date().after(tenant.getExpireTime())) {
&& new Date().after(tenant.getExpireTime())) {
log.info("登录租户：{} 已超过有效期.", tenantId);
throw new TenantException("tenant.expired");
}