From 3baad24912481e485c0e44bf11219bc09a5d1ddd Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 17 二月 2023 11:23:25 +0800 Subject: [PATCH] fix 修复 解决部门id无法查询到部门的空指针异常 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 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 a847c3f..0de88f9 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,6 +1,5 @@ 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 lombok.Data; @@ -14,8 +13,7 @@ /** * 鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄 sys_user * - * @author ruoyi - * @date 2023-02-01 + * @author Michelle.Chung */ @Data public class SysUserVo implements Serializable { @@ -27,6 +25,11 @@ * 鐢ㄦ埛ID */ private Long userId; + + /** + * 绉熸埛ID + */ + private String tenantId; /** * 閮ㄩ棬ID @@ -123,9 +126,5 @@ * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID */ private Long roleId; - - public boolean isAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.userId); - } } -- Gitblit v1.9.3