From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 375730f..1dc0d3d 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
@@ -3,6 +3,8 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -71,10 +73,10 @@
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
+// @Excels({
+// @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+// @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+// })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
@@ -88,6 +90,17 @@
/** 瑙掕壊ID */
private Long roleId;
+
+
+ public Integer getClanId() {
+ return clanId;
+ }
+
+ private Integer clanId;
+
+ public void setClanId(Integer clanId) {
+ this.clanId = clanId;
+ }
public SysUser()
{
@@ -117,6 +130,7 @@
public static boolean isAdmin(Long userId)
{
//1鍙风敤鎴峰氨鏄鐞嗗憳
+ //杩欓噷闇�瑕佷慨鏀规垚绠＄悊鍛橈紝鏌ヨ鏁版嵁搴�
return userId != null && 1L == userId;
}
@@ -302,7 +316,9 @@
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
- .append("deptId", getDeptId())
+ .append("clanId", getClanId())
+
+ .append("deptId", getDeptId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
--
Gitblit v1.9.1