diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
index 8a81a2d6b..b729b1ec2 100755
--- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
@@ -9,9 +9,13 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
/**
* 登录用户身份权限
@@ -267,6 +271,9 @@ public class LoginUser implements UserDetails {
@Override
public Collection extends GrantedAuthority> getAuthorities() {
- return null;
+ if (permissions == null || permissions.isEmpty()) {
+ return Collections.emptySet();
+ }
+ return permissions.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet());
}
}
diff --git a/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
index c5f75dec9..2d8d6b974 100755
--- a/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,7 +24,7 @@
-
+