From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 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..515210e 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,25 @@
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.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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
@@ -57,9 +60,13 @@
@Excel(name = "璐﹀彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
-
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ private String delFlag;
+
+ /** 鏄惁寮�閫欰I鍔熻兘锛�0鍚� 1鏄級 */
+ @JsonIgnore
+ private Integer aiEnabled;
+
/** 鏈�鍚庣櫥褰旾P */
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
private String loginIp;
@@ -73,31 +80,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 +126,7 @@
/**
* 閮ㄩ棬鍚嶇О
*/
+ @TableField(exist = false)
private String deptNames;
public Long getCurrentDeptId() {
@@ -239,15 +255,25 @@
this.status = status;
}
- public String getDelFlag()
- {
- return delFlag;
- }
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public Integer getAiEnabled()
+ {
+ return aiEnabled;
+ }
+
+ public void setAiEnabled(Integer aiEnabled)
+ {
+ this.aiEnabled = aiEnabled;
+ }
public String getLoginIp()
{
@@ -362,16 +388,16 @@
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("loginIp", getLoginIp())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("aiEnabled", getAiEnabled())
+ .append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
- .append("dept", getDept())
.toString();
}
}
--
Gitblit v1.9.3