wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Revert " fix(security): 修复登录时 Collection.size() NPE — Spring Boot 4.0 适配"

Browse Source 
This reverts commit 0e69a01120.
This commit is contained in:
wangjian963
2026-06-05 11:48:03 +08:00
parent 0e69a01120
commit b5082c526f
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
View File

@@ -9,13 +9,9 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
/** /**
* 登录用户身份权限 * 登录用户身份权限
@@ -271,9 +267,6 @@ public class LoginUser implements UserDetails {
@Override @Override
public Collection<? extends GrantedAuthority> getAuthorities() { public Collection<? extends GrantedAuthority> getAuthorities() {
if (permissions == null || permissions.isEmpty()) { return null;
return Collections.emptySet();
}
return permissions.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet());
} }
} }

2
openhis-server-new/core-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -24,7 +24,7 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<association property="dept" javaType="SysDept" resultMap="deptResult"/> <association property="dept" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" notNullColumn="role_id"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap> </resultMap>
<resultMap id="deptResult" type="SysDept"> <resultMap id="deptResult" type="SysDept">