From 127bfa0f3d118df3c4754e8f260d667d1c7903b7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 17 六月 2025 18:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 16d9393..f868860 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
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -18,6 +19,7 @@
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
+import org.springframework.stereotype.Component;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -25,9 +27,13 @@
* @author ruoyi
*/
@Data
+@Component
@ApiModel(value = "SysUser", description = "鐢ㄦ埛瀵硅薄")
public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;
+//
+// @Value("${isAdmin}")
+// private List<Long> isAdmin;
/**
* 鐢ㄦ埛ID
@@ -301,13 +307,13 @@
this.userId = userId;
}
- public boolean isAdmin() {
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
- }
+// public boolean isAdmin() {
+// return isAdmin(this.userId);
+// }
+//
+// public boolean isAdmin(Long userId) {
+// return isAdmin.contains(userId);
+// }
public Long getDeptId() {
return this.deptId;
--
Gitblit v1.9.3