From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 81e374a..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,11 @@
package com.ruoyi.common.core.domain.model;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
import com.ruoyi.common.helper.LoginHelper;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
@@ -20,6 +20,7 @@
@NoArgsConstructor
public class LoginUser implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
@@ -31,6 +32,11 @@
* 閮ㄩ棬ID
*/
private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚�
+ */
+ private String deptName;
/**
* 鐢ㄦ埛鍞竴鏍囪瘑
@@ -88,14 +94,9 @@
private String username;
/**
- * 閮ㄩ棬瀵硅薄
- */
- private SysDept dept;
-
- /**
* 瑙掕壊瀵硅薄
*/
- private List<SysRole> roles;
+ private List<RoleDTO> roles;
/**
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
@@ -106,6 +107,12 @@
* 鑾峰彇鐧诲綍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