From 3c8d864b5f68af5167199e0d5c9ff6c0c5852638 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:35:45 +0800
Subject: [PATCH] !639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
index 04d1ce0..2669a81 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
@@ -1,11 +1,5 @@
package org.dromara.system.domain.bo;
-import org.dromara.common.core.constant.UserConstants;
-import org.dromara.common.core.xss.Xss;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.sensitive.annotation.Sensitive;
-import org.dromara.common.sensitive.core.SensitiveStrategy;
-import org.dromara.system.domain.SysUser;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
@@ -13,8 +7,10 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-
-import java.util.Date;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.xss.Xss;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysUser;
/**
* 鐢ㄦ埛淇℃伅涓氬姟瀵硅薄 sys_user
@@ -50,6 +46,7 @@
* 鐢ㄦ埛鏄电О
*/
@Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
+ @NotBlank(message = "鐢ㄦ埛鏄电О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String nickName;
@@ -61,7 +58,6 @@
/**
* 鐢ㄦ埛閭
*/
- @Sensitive(strategy = SensitiveStrategy.EMAIL)
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String email;
@@ -69,18 +65,12 @@
/**
* 鎵嬫満鍙风爜
*/
- @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆锛�0鐢� 1濂� 2鏈煡锛�
*/
private String sex;
-
- /**
- * 澶村儚鍦板潃
- */
- private Long avatar;
/**
* 瀵嗙爜
@@ -91,16 +81,6 @@
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
private String status;
-
- /**
- * 鏈�鍚庣櫥褰旾P
- */
- private String loginIp;
-
- /**
- * 鏈�鍚庣櫥褰曟椂闂�
- */
- private Date loginDate;
/**
* 澶囨敞
@@ -123,12 +103,17 @@
*/
private Long roleId;
+ /**
+ * 鎺掗櫎涓嶆煡璇㈢殑鐢ㄦ埛(宸ヤ綔娴佺敤)
+ */
+ private String excludeUserIds;
+
public SysUserBo(Long userId) {
this.userId = userId;
}
public boolean isSuperAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
+ return SystemConstants.SUPER_ADMIN_ID.equals(this.userId);
}
}
--
Gitblit v1.9.3