From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 b568471..d75fcc0 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -1,22 +1,24 @@
package com.ruoyi.project.system.domain;
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
import com.baomidou.mybatisplus.annotation.TableField;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import jakarta.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -73,31 +75,39 @@
@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 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() {
@@ -111,6 +121,7 @@
/**
* 閮ㄩ棬鍚嶇О
*/
+ @TableField(exist = false)
private String deptNames;
public Long getCurrentDeptId() {
@@ -371,7 +382,6 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
- .append("dept", getDept())
.toString();
}
}
--
Gitblit v1.9.3