From f5f22d70397d36fef8c47f9c3aae510133057b83 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 07 五月 2025 15:18:38 +0800
Subject: [PATCH] 用户信息添加tenant_id
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 0a0e95a..64938d0 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -2,13 +2,10 @@
import java.util.Date;
import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
@@ -25,7 +22,7 @@
private static final long serialVersionUID = 1L;
/** 鐢ㄦ埛ID */
- @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+ @Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
private Long userId;
/** 閮ㄩ棬ID */
@@ -45,7 +42,7 @@
private String email;
/** 鎵嬫満鍙风爜 */
- @Excel(name = "鎵嬫満鍙风爜")
+ @Excel(name = "鎵嬫満鍙风爜", cellType = ColumnType.TEXT)
private String phonenumber;
/** 鐢ㄦ埛鎬у埆 */
@@ -58,8 +55,8 @@
/** 瀵嗙爜 */
private String password;
- /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ /** 璐﹀彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "璐﹀彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
@@ -91,6 +88,9 @@
/** 瑙掕壊ID */
private Long roleId;
+
+ /** 绉熸埛ID */
+ private Integer tenantId;
public SysUser()
{
@@ -132,6 +132,7 @@
this.deptId = deptId;
}
+ @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getNickName()
{
@@ -143,6 +144,7 @@
this.nickName = nickName;
}
+ @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getUserName()
@@ -198,8 +200,6 @@
this.avatar = avatar;
}
- @JsonIgnore
- @JsonProperty
public String getPassword()
{
return password;
@@ -300,6 +300,14 @@
this.roleId = roleId;
}
+ public Integer getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Integer tenantId) {
+ this.tenantId = tenantId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3