From 0e39f6fa2d67de9d956f3e043f68b7bd7a030db2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 02 九月 2022 17:55:02 +0800 Subject: [PATCH] remove 移除部署脚本 使用idea功能替代 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 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 4651b00..c93b9ef 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,10 +1,12 @@ package com.ruoyi.common.core.domain.model; +import com.ruoyi.common.core.domain.dto.RoleDTO; import com.ruoyi.common.helper.LoginHelper; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.List; import java.util.Set; /** @@ -28,6 +30,11 @@ * 閮ㄩ棬ID */ private Long deptId; + + /** + * 閮ㄩ棬鍚� + */ + private String deptName; /** * 鐢ㄦ埛鍞竴鏍囪瘑 @@ -85,9 +92,25 @@ private String username; /** + * 瑙掕壊瀵硅薄 + */ + private List<RoleDTO> roles; + + /** + * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID + */ + private Long roleId; + + /** * 鑾峰彇鐧诲綍id */ public String getLoginId() { + if (userType == null) { + throw new IllegalArgumentException("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"); + } + if (userId == null) { + throw new IllegalArgumentException("鐢ㄦ埛ID涓嶈兘涓虹┖"); + } return userType + LoginHelper.JOIN_CODE + userId; } -- Gitblit v1.9.3