From 5c2313d622a190697b4c7a54b7cbddb0b7d8eca6 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期四, 25 八月 2022 13:54:31 +0800
Subject: [PATCH] [fix]: 1. (common) SysRole 角色表 - 修正表字段不存在异常 ;

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java |   21 +++++++++++++--------
 1 files changed, 13 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..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,7 +1,6 @@
 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;
@@ -31,6 +30,11 @@
      * 閮ㄩ棬ID
      */
     private Long deptId;
+
+    /**
+     * 閮ㄩ棬鍚�
+     */
+    private String deptName;
 
     /**
      * 鐢ㄦ埛鍞竴鏍囪瘑
@@ -88,14 +92,9 @@
     private String username;
 
     /**
-     * 閮ㄩ棬瀵硅薄
-     */
-    private SysDept dept;
-
-    /**
      * 瑙掕壊瀵硅薄
      */
-    private List<SysRole> roles;
+    private List<RoleDTO> roles;
 
     /**
      * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
@@ -106,6 +105,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