From a53fe7761f4ab226265d51935dad71d41e9bceff Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 四月 2022 14:02:18 +0800
Subject: [PATCH] Merge pull request #457 from J1031/bugfix/transaction_is_null
---
src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
index 93680fd..45e03bc 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf.security.dto;
+import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
import org.springframework.security.core.CredentialsContainer;
import org.springframework.security.core.GrantedAuthority;
@@ -93,8 +94,8 @@
return user.getId();
}
- public int getRoleId() {
- return user.getRoleId();
+ public Role getRole() {
+ return user.getRole();
}
--
Gitblit v1.8.0