From 1c0562ba18786d00e68fe96a0704e1e6a1f52d77 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 05 Jan 2026 14:50:37 +0800
Subject: [PATCH] 将isAdmin方法统一到SecurityUtils
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index b00838c..02e3b00 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type;
+import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss;
@@ -22,7 +23,7 @@
private static final long serialVersionUID = 1L;
/** 用户ID */
- @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+ @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;
/** 部门ID */
@@ -55,8 +56,8 @@
/** 密码 */
private String password;
- /** 帐号状态（0正常 1停用） */
- @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+ /** 账号状态（0正常 1停用） */
+ @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（0代表存在 2代表删除） */
@@ -69,6 +70,9 @@
/** 最后登录时间 */
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
+
+ /** 密码最后更新时间 */
+ private Date pwdUpdateDate;
/** 部门对象 */
@Excels({
@@ -111,12 +115,7 @@
public boolean isAdmin()
{
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
+ return UserConstants.isAdmin(userId);
}
public Long getDeptId()
@@ -247,6 +246,16 @@
this.loginDate = loginDate;
}
+ public Date getPwdUpdateDate()
+ {
+ return pwdUpdateDate;
+ }
+
+ public void setPwdUpdateDate(Date pwdUpdateDate)
+ {
+ this.pwdUpdateDate = pwdUpdateDate;
+ }
+
public SysDept getDept()
{
return dept;
@@ -296,6 +305,7 @@
{
this.roleId = roleId;
}
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -312,6 +322,7 @@
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
+ .append("pwdUpdateDate", getPwdUpdateDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
--
Gitblit v1.9.3