From aad364bb323a1eaa0389ee5c6389bdc0ea7ed526 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 29 Jun 2026 17:09:28 +0800
Subject: [PATCH] 修改
---
hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java b/hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java
index 572be55..8136177 100644
--- a/hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java
+++ b/hazmat-framework/src/main/java/com/gkhy/hazmat/framework/web/service/UserDetailServiceImpl.java
@@ -61,20 +61,23 @@
Set<String> roleKeys = permissionService.getRolePermission(user);
Set<String> permKeys = permissionService.getMenuPermission(user);
- List<GrantedAuthority> authorities = new ArrayList<>();
+// List<GrantedAuthority> authorities = new ArrayList<>();
+// for (String perm : permKeys) {
+// authorities.add(new SimpleGrantedAuthority(perm));
+// }
+ List<GrantedAuthority> authorities=new ArrayList<>();
for (String perm : permKeys) {
authorities.add(new SimpleGrantedAuthority(perm));
}
-// List<GrantedAuthority> authorities=new ArrayList<>();
-// if(UserTypeEnum.SYSTEM_USER.getCode().equals(user.getUserType())) {
-// authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
-// }else if(UserTypeEnum.COMPANY_USER.getCode().equals(user.getUserType())){
-// authorities.add(new SimpleGrantedAuthority("hazmat:manage:company"));
-// }else if(UserTypeEnum.NORMAL_USER.getCode().equals(user.getUserType())){
-// authorities.add(new SimpleGrantedAuthority("hazmat:manage:common"));
-// }else if (UserTypeEnum.CHECK_USER.getCode().equals(user.getUserType())){
-// authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
-// }
+ if(UserTypeEnum.SYSTEM_USER.getCode().equals(user.getUserType())) {
+ authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
+ }else if(UserTypeEnum.COMPANY_USER.getCode().equals(user.getUserType())){
+ authorities.add(new SimpleGrantedAuthority("hazmat:manage:company"));
+ }else if(UserTypeEnum.NORMAL_USER.getCode().equals(user.getUserType())){
+ authorities.add(new SimpleGrantedAuthority("hazmat:manage:common"));
+ }else if (UserTypeEnum.CHECK_USER.getCode().equals(user.getUserType())){
+ authorities.add(new SimpleGrantedAuthority("hazmat:manage:system"));
+ }
return new LoginUserDetails(user,authorities,roleKeys,permKeys);
}
}
--
Gitblit v1.9.2