From a4c35cecaab01c211e7ba077e63a0941ef4335b2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 17:51:40 +0800
Subject: [PATCH] 优化用户导入更新时需获取用户编号问题

---
 src/main/java/com/ruoyi/project/system/domain/SysUser.java |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 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 f63f598..838a484 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;
@@ -58,9 +55,6 @@
     /** 瀵嗙爜 */
     private String password;
 
-    /** 鐩愬姞瀵� */
-    private String salt;
-
     /** 甯愬彿鐘舵�侊紙0姝e父 1鍋滅敤锛� */
     @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝e父,1=鍋滅敤")
     private String status;
@@ -68,12 +62,12 @@
     /** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
     private String delFlag;
 
-    /** 鏈�鍚庣櫥闄咺P */
-    @Excel(name = "鏈�鍚庣櫥闄咺P", type = Type.EXPORT)
+    /** 鏈�鍚庣櫥褰旾P */
+    @Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
     private String loginIp;
 
-    /** 鏈�鍚庣櫥闄嗘椂闂� */
-    @Excel(name = "鏈�鍚庣櫥闄嗘椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    /** 鏈�鍚庣櫥褰曟椂闂� */
+    @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /** 閮ㄩ棬瀵硅薄 */
@@ -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