From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java | 53 ++++-------------------------------------------------
1 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
index 77c1770..18e11c5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
@@ -1,20 +1,13 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.core.annotation.Sensitive;
import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.enums.SensitiveStrategy;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import com.ruoyi.common.tenant.core.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.util.Date;
-import java.util.List;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -26,7 +19,7 @@
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("sys_user")
-public class SysUser extends BaseEntity {
+public class SysUser extends TenantEntity {
/**
* 鐢ㄦ埛ID
@@ -42,16 +35,11 @@
/**
* 鐢ㄦ埛璐﹀彿
*/
- @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String userName;
/**
* 鐢ㄦ埛鏄电О
*/
- @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String nickName;
/**
@@ -62,15 +50,11 @@
/**
* 鐢ㄦ埛閭
*/
- @Sensitive(strategy = SensitiveStrategy.EMAIL)
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String email;
/**
* 鎵嬫満鍙风爜
*/
- @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phonenumber;
/**
@@ -81,7 +65,7 @@
/**
* 鐢ㄦ埛澶村儚
*/
- private String avatar;
+ private Long avatar;
/**
* 瀵嗙爜
@@ -119,41 +103,12 @@
*/
private String remark;
- /**
- * 閮ㄩ棬瀵硅薄
- */
- @TableField(exist = false)
- private SysDept dept;
-
- /**
- * 瑙掕壊瀵硅薄
- */
- @TableField(exist = false)
- private List<SysRole> roles;
-
- /**
- * 瑙掕壊缁�
- */
- @TableField(exist = false)
- private Long[] roleIds;
-
- /**
- * 宀椾綅缁�
- */
- @TableField(exist = false)
- private Long[] postIds;
-
- /**
- * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
- */
- @TableField(exist = false)
- private Long roleId;
public SysUser(Long userId) {
this.userId = userId;
}
- public boolean isAdmin() {
+ public boolean isSuperAdmin() {
return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
}
--
Gitblit v1.9.3