From d7fd24cda7b8b5124fca826fa4301cdb3acdb6b5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 八月 2025 17:46:52 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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..769e468 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
@@ -76,6 +82,20 @@
@ApiModelProperty(value = "鑱屼綅")
@Excel(name = "鑱屼綅")
private String title;
+
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ @Excel(name = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptName;
/**
* 鐢ㄦ埛閭
@@ -301,13 +321,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