From b3f4a1431a1260c1e3deaf76b5c88bf34d5d6872 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 九月 2025 10:11:11 +0800
Subject: [PATCH] userCode提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 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..b59dcb3 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
@@ -1,23 +1,26 @@
package com.ruoyi.common.core.domain.entity;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import javax.validation.constraints.*;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -25,9 +28,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
@@ -41,6 +48,12 @@
*/
@ApiModelProperty(value = "his鐢ㄦ埛ID")
private String hisUserId;
+
+ /**
+ * his鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value = "his鐢ㄦ埛ID")
+ private String userCode;
/**
* 閮ㄩ棬ID
@@ -76,6 +89,20 @@
@ApiModelProperty(value = "鑱屼綅")
@Excel(name = "鑱屼綅")
private String title;
+
+ /**
+ * 閮ㄩ棬缂栫爜
+ */
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜")
+ @Excel(name = "閮ㄩ棬缂栫爜")
+ private String deptCode;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptName;
/**
* 鐢ㄦ埛閭
@@ -301,13 +328,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