From 7acfcc01891e77fc1aa7e99fb77ed0aa9b5e997c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 七月 2025 09:21:10 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 2dceb2e..1c27228 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -28,7 +28,7 @@
/**
* 部门ID
*/
- private Long deptId;
+ private String deptId;
/**
* 用户唯一标识
@@ -54,6 +54,10 @@
* 登录地点
*/
private String loginLocation;
+ /**
+ * 角色名称
+ */
+ private String roleName;
/**
* 浏览器类型
@@ -73,20 +77,21 @@
/**
* 用户信息
*/
- private TTenantResp user;
+ private SysUser user;
+ private Integer deptType;
public LoginUserApplet()
{
}
- public LoginUserApplet(TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(SysUser user, Set<String> permissions)
{
this.user = user;
this.permissions = permissions;
}
- public LoginUserApplet(Long userId, Long deptId, TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(Long userId, String deptId, SysUser user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -104,12 +109,12 @@
this.userId = userId;
}
- public Long getDeptId()
+ public String getDeptId()
{
return deptId;
}
- public void setDeptId(Long deptId)
+ public void setDeptId(String deptId)
{
this.deptId = deptId;
}
@@ -134,7 +139,7 @@
@Override
public String getUsername()
{
- return user.getResidentName();
+ return user.getUserName();
}
/**
--
Gitblit v1.7.1