From f6b6188425efe6dc2c41a8dafb66f8ddd609a87f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 20 八月 2023 21:30:57 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java b/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
index cb00fbd..f609db8 100644
--- a/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
+++ b/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
@@ -1,7 +1,7 @@
package com.ycl.bo;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsMenu;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -13,10 +13,12 @@
/**
* SpringSecurity闇�瑕佺殑鐢ㄦ埛璇︽儏
*/
+
public class AdminUserDetails implements UserDetails {
private UmsAdmin umsAdmin;
- private List<UmsResource> resourceList;
- public AdminUserDetails(UmsAdmin umsAdmin, List<UmsResource> resourceList) {
+ private List<UmsMenu> resourceList;
+
+ public AdminUserDetails(UmsAdmin umsAdmin, List<UmsMenu> resourceList) {
this.umsAdmin = umsAdmin;
this.resourceList = resourceList;
}
@@ -25,7 +27,7 @@
public Collection<? extends GrantedAuthority> getAuthorities() {
//杩斿洖褰撳墠鐢ㄦ埛鐨勮鑹�
return resourceList.stream()
- .map(role ->new SimpleGrantedAuthority(role.getId()+":"+role.getName()))
+ .map(role -> new SimpleGrantedAuthority(role.getId() + ":" + role.getTitle()))
.collect(Collectors.toList());
}
@@ -59,7 +61,11 @@
return umsAdmin.getStatus().equals(1);
}
- public Long getUserId(){
+ public Long getUserId() {
return umsAdmin.getId();
}
+
+ public UmsAdmin getUmsAdmin() {
+ return umsAdmin;
+ }
}
--
Gitblit v1.8.0