From f3aff3460203eef795e9b5a5b3dd41368cc5ec39 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 11:16:37 +0800
Subject: [PATCH] update 优化 调整 system entity 实体与 controller 包结构
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 c93bd1c..a680751 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,11 +1,13 @@
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 lombok.experimental.Accessors;
+import java.io.Serial;
import java.io.Serializable;
+import java.util.List;
import java.util.Set;
/**
@@ -16,9 +18,9 @@
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class LoginUser implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
@@ -30,6 +32,11 @@
* 閮ㄩ棬ID
*/
private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚�
+ */
+ private String deptName;
/**
* 鐢ㄦ埛鍞竴鏍囪瘑
@@ -87,9 +94,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