From c3bb4d2a6181e27b58cca56def0f392d6df7d7a1 Mon Sep 17 00:00:00 2001
From: zhujie <693337446@qq.com>
Date: 星期五, 26 十一月 2021 13:01:00 +0800
Subject: [PATCH] add 新增导入支持开启Validator数据验证，支持开启导入异常行继续读取，支持返回导入回执
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index 9f7727a..b138c52 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -75,31 +74,38 @@
private Set<String> permissions;
/**
- * 鐢ㄦ埛淇℃伅
+ * 鐢ㄦ埛鍚�
*/
- private SysUser user;
+ private String username;
- public LoginUser(SysUser user, Set<String> permissions) {
- this.user = user;
+ /**
+ * 瀵嗙爜
+ */
+ private String password;
+
+ public LoginUser(String username, String password, Set<String> permissions) {
+ this.username = username;
+ this.password = password;
this.permissions = permissions;
}
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) {
+ public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
this.userId = userId;
this.deptId = deptId;
- this.user = user;
+ this.username = username;
+ this.password = password;
this.permissions = permissions;
}
@JsonIgnore
@Override
public String getPassword() {
- return user.getPassword();
+ return password;
}
@Override
public String getUsername() {
- return user.getUserName();
+ return username;
}
/**
--
Gitblit v1.9.3