From 5b3901770843cab6ba0e434fdbe3e3302c9ff88e Mon Sep 17 00:00:00 2001
From: 心如止水 <8902735+gaobinbin991314@user.noreply.gitee.com>
Date: 星期四, 30 三月 2023 18:50:58 +0800
Subject: [PATCH] !324 系统配置读取方式变更 1、前端登录页面注册开关 对接后端数据库 2、密码最大错误次数与锁定时间转移到数据库 3、短信开关与验证码模板id 转移到数据库参数管理内
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
index 90849b1..55c008a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
@@ -1,8 +1,11 @@
package com.ruoyi.system.domain.vo;
-import com.ruoyi.common.core.constant.UserConstants;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.translation.annotation.Translation;
import com.ruoyi.common.translation.constant.TransConstant;
+import com.ruoyi.system.domain.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
@@ -17,6 +20,7 @@
* @author Michelle.Chung
*/
@Data
+@AutoMapper(target = SysUser.class)
public class SysUserVo implements Serializable {
@Serial
@@ -26,6 +30,11 @@
* 鐢ㄦ埛ID
*/
private Long userId;
+
+ /**
+ * 绉熸埛ID
+ */
+ private String tenantId;
/**
* 閮ㄩ棬ID
@@ -71,6 +80,8 @@
/**
* 瀵嗙爜
*/
+ @JsonIgnore
+ @JsonProperty
private String password;
/**
@@ -122,9 +133,5 @@
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
*/
private Long roleId;
-
- public boolean isAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
- }
}
--
Gitblit v1.9.3