From d9ff3817f056ad245a16bd394133a407d6c6b9cf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 3f7e227..ac7f535 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -16,7 +16,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -73,32 +73,62 @@
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
})
+ @TableField(exist = false)
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
+ @TableField(exist = false)
private List<SysRole> roles;
/** 瑙掕壊缁� */
+ @TableField(exist = false)
private Long[] roleIds;
/** 宀椾綅缁� */
+ @TableField(exist = false)
private Long[] postIds;
/** 瑙掕壊ID */
+ @TableField(exist = false)
private Long roleId;
/** 绉熸埛ID */
- private Integer tenantId;
+ private Long tenantId;
+ @TableField(exist = false)
private Long[] deptIds;
@TableField(exist = false)
private Long deptId;
+ @TableField(exist = false)
+ private Long currentDeptId;
+
+ /** 褰撳墠鐧诲綍鍏徃 */
+ @TableField(exist = false)
+ private String currentFactoryName;
+
+ public String getCurrentFactoryName() {
+ return currentFactoryName;
+ }
+
+ public void setCurrentFactoryName(String currentFactoryName) {
+ this.currentFactoryName = currentFactoryName;
+ }
+
/**
* 閮ㄩ棬鍚嶇О
*/
+ @TableField(exist = false)
private String deptNames;
+
+ public Long getCurrentDeptId() {
+ return currentDeptId;
+ }
+
+ public void setCurrentDeptId(Long currentDeptId) {
+ this.currentDeptId = currentDeptId;
+ }
public SysUser()
{
@@ -298,11 +328,11 @@
this.roleId = roleId;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
@@ -350,7 +380,6 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
- .append("dept", getDept())
.toString();
}
}
--
Gitblit v1.9.3