From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 258 ++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 124 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 dde679c..bc3170d 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
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Sensitive;
import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.enums.SensitiveStrategy;
import com.ruoyi.common.xss.Xss;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -32,156 +34,164 @@
@ApiModel("鐢ㄦ埛淇℃伅涓氬姟瀵硅薄")
public class SysUser extends BaseEntity {
- /**
- * 鐢ㄦ埛ID
- */
- @ApiModelProperty(value = "鐢ㄦ埛ID")
- @TableId(value = "user_id")
- private Long userId;
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛ID")
+ @TableId(value = "user_id")
+ private Long userId;
- /**
- * 閮ㄩ棬ID
- */
- @ApiModelProperty(value = "閮ㄩ棬ID")
- private Long deptId;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value = "閮ㄩ棬ID")
+ private Long deptId;
- /**
- * 鐢ㄦ埛璐﹀彿
- */
- @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
+ /**
+ * 鐢ㄦ埛璐﹀彿
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
@Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- private String userName;
+ @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
+ private String userName;
- /**
- * 鐢ㄦ埛鏄电О
- */
+ /**
+ * 鐢ㄦ埛鏄电О
+ */
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- private String nickName;
+ private String nickName;
- /**
- * 鐢ㄦ埛閭
- */
- @ApiModelProperty(value = "鐢ㄦ埛閭")
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String email;
+ /**
+ * 鐢ㄦ埛绫诲瀷锛坰ys_user绯荤粺鐢ㄦ埛锛�
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
+ private String userType;
- /**
- * 鎵嬫満鍙风爜
- */
- @ApiModelProperty(value = "鎵嬫満鍙风爜")
- private String phonenumber;
+ /**
+ * 鐢ㄦ埛閭
+ */
+ @Sensitive(strategy = SensitiveStrategy.EMAIL)
+ @ApiModelProperty(value = "鐢ㄦ埛閭")
+ @Email(message = "閭鏍煎紡涓嶆纭�")
+ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String email;
- /**
- * 鐢ㄦ埛鎬у埆
- */
- @ApiModelProperty(value = "鐢ㄦ埛鎬у埆")
- private String sex;
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @Sensitive(strategy = SensitiveStrategy.PHONE)
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ private String phonenumber;
- /**
- * 鐢ㄦ埛澶村儚
- */
- @ApiModelProperty(value = "鐢ㄦ埛澶村儚")
- private String avatar;
+ /**
+ * 鐢ㄦ埛鎬у埆
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛鎬у埆")
+ private String sex;
- /**
- * 瀵嗙爜
- */
- @ApiModelProperty(value = "瀵嗙爜")
- @TableField(
- insertStrategy = FieldStrategy.NOT_EMPTY,
- updateStrategy = FieldStrategy.NOT_EMPTY,
- whereStrategy = FieldStrategy.NOT_EMPTY
- )
- private String password;
+ /**
+ * 鐢ㄦ埛澶村儚
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛澶村儚")
+ private String avatar;
- @JsonIgnore
- @JsonProperty
- public String getPassword() {
- return password;
- }
+ /**
+ * 瀵嗙爜
+ */
+ @ApiModelProperty(value = "瀵嗙爜")
+ @TableField(
+ insertStrategy = FieldStrategy.NOT_EMPTY,
+ updateStrategy = FieldStrategy.NOT_EMPTY,
+ whereStrategy = FieldStrategy.NOT_EMPTY
+ )
+ private String password;
- /**
- * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
- */
- @ApiModelProperty(value = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
- private String status;
+ @JsonIgnore
+ @JsonProperty
+ public String getPassword() {
+ return password;
+ }
- /**
- * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
- */
- @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
- @TableLogic
- private String delFlag;
+ /**
+ * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @ApiModelProperty(value = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
+ private String status;
- /**
- * 鏈�鍚庣櫥褰旾P
- */
- @ApiModelProperty(value = "鏈�鍚庣櫥褰旾P")
- private String loginIp;
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
+ @TableLogic
+ private String delFlag;
- /**
- * 鏈�鍚庣櫥褰曟椂闂�
- */
- @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
- private Date loginDate;
+ /**
+ * 鏈�鍚庣櫥褰旾P
+ */
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰旾P")
+ private String loginIp;
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
+ /**
+ * 鏈�鍚庣櫥褰曟椂闂�
+ */
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
+ private Date loginDate;
- /**
- * 閮ㄩ棬瀵硅薄
- */
- @ApiModelProperty(value = "閮ㄩ棬瀵硅薄")
- @TableField(exist = false)
- private SysDept dept;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
- /**
- * 瑙掕壊瀵硅薄
- */
- @ApiModelProperty(value = "瑙掕壊瀵硅薄")
- @TableField(exist = false)
- private List<SysRole> roles;
+ /**
+ * 閮ㄩ棬瀵硅薄
+ */
+ @ApiModelProperty(value = "閮ㄩ棬瀵硅薄")
+ @TableField(exist = false)
+ private SysDept dept;
- /**
- * 瑙掕壊缁�
- */
- @ApiModelProperty(value = "瑙掕壊缁�")
- @TableField(exist = false)
- private Long[] roleIds;
+ /**
+ * 瑙掕壊瀵硅薄
+ */
+ @ApiModelProperty(value = "瑙掕壊瀵硅薄")
+ @TableField(exist = false)
+ private List<SysRole> roles;
- /**
- * 宀椾綅缁�
- */
- @ApiModelProperty(value = "宀椾綅缁�")
- @TableField(exist = false)
- private Long[] postIds;
+ /**
+ * 瑙掕壊缁�
+ */
+ @ApiModelProperty(value = "瑙掕壊缁�")
+ @TableField(exist = false)
+ private Long[] roleIds;
- /**
- * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
- */
- @ApiModelProperty(value = "瑙掕壊ID")
- @TableField(exist = false)
- private Long roleId;
+ /**
+ * 宀椾綅缁�
+ */
+ @ApiModelProperty(value = "宀椾綅缁�")
+ @TableField(exist = false)
+ private Long[] postIds;
- public SysUser(Long userId) {
- this.userId = userId;
- }
+ /**
+ * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
+ */
+ @ApiModelProperty(value = "瑙掕壊ID")
+ @TableField(exist = false)
+ private Long roleId;
- @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
- public boolean isAdmin() {
- return isAdmin(this.userId);
- }
+ public SysUser(Long userId) {
+ this.userId = userId;
+ }
- public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
- }
+ @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
+ public boolean isAdmin() {
+ return isAdmin(this.userId);
+ }
+
+ public static boolean isAdmin(Long userId) {
+ return userId != null && 1L == userId;
+ }
}
--
Gitblit v1.9.3