From b91c848962b64ec52b4c139ed2cc0fb4cd1a88c0 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 29 七月 2022 20:28:38 +0800
Subject: [PATCH] !538 优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） Merge pull request !538 from abbfun/N/A
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 4c35925..8d4d4c5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -2,18 +2,15 @@
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.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.xss.Xss;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -58,9 +55,6 @@
/** 瀵嗙爜 */
private String password;
- /** 鐩愬姞瀵� */
- private String salt;
-
/** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
@Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
@@ -91,6 +85,9 @@
/** 宀椾綅缁� */
private Long[] postIds;
+
+ /** 瑙掕壊ID */
+ private Long roleId;
public SysUser()
{
@@ -132,6 +129,7 @@
this.deptId = deptId;
}
+ @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getNickName()
{
@@ -143,6 +141,7 @@
this.nickName = nickName;
}
+ @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getUserName()
@@ -198,8 +197,6 @@
this.avatar = avatar;
}
- @JsonIgnore
- @JsonProperty
public String getPassword()
{
return password;
@@ -208,16 +205,6 @@
public void setPassword(String password)
{
this.password = password;
- }
-
- public String getSalt()
- {
- return salt;
- }
-
- public void setSalt(String salt)
- {
- this.salt = salt;
}
public String getStatus()
@@ -300,6 +287,16 @@
this.postIds = postIds;
}
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -312,7 +309,6 @@
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
- .append("salt", getSalt())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
--
Gitblit v1.9.3