From a28dd0fe4057d9d1c52be85457ad0c3882ec2d40 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 18:26:09 +0800
Subject: [PATCH] fix 修复 数据加密拦截器空数据异常
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java | 13 ++++++++-----
1 files changed, 8 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..932eb94 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,9 @@
package com.ruoyi.system.domain.vo;
-import com.ruoyi.common.core.constant.UserConstants;
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 +18,7 @@
* @author Michelle.Chung
*/
@Data
+@AutoMapper(target = SysUser.class)
public class SysUserVo implements Serializable {
@Serial
@@ -26,6 +28,11 @@
* 鐢ㄦ埛ID
*/
private Long userId;
+
+ /**
+ * 绉熸埛ID
+ */
+ private String tenantId;
/**
* 閮ㄩ棬ID
@@ -122,9 +129,5 @@
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
*/
private Long roleId;
-
- public boolean isAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
- }
}
--
Gitblit v1.9.3