From 8d761fa60c744bf7ffeefbf260714c2ed4fe24f2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 29 五月 2021 18:54:35 +0800
Subject: [PATCH] update 优化数据权限sql 解决MP apply注入附带 AND 语法问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 25d915e..110c548 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
@@ -15,12 +15,15 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
@@ -28,7 +31,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user")
-public class SysUser
+public class SysUser implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -71,9 +74,13 @@
private String avatar;
/** 瀵嗙爜 */
+ private String password;
+
@JsonIgnore
@JsonProperty
- private String password;
+ public String getPassword() {
+ return password;
+ }
/** 鐩愬姞瀵� */
private String salt;
@@ -95,6 +102,7 @@
private Date loginDate;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -103,6 +111,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@@ -113,6 +122,12 @@
/** 澶囨敞 */
private String remark;
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
/** 閮ㄩ棬瀵硅薄 */
@Excels({
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
--
Gitblit v1.9.3