From b5082c526f4e6016887a8aa97735916ce27d1676 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Fri, 5 Jun 2026 11:48:03 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=20fix(security):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=99=BB=E5=BD=95=E6=97=B6=20Collection.size()=20NPE?=
 =?UTF-8?q?=20=E2=80=94=20Spring=20Boot=204.0=20=E9=80=82=E9=85=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e69a0112094b9d1035564ae468b471eb4f7b3e3.
---
 .../com/core/common/core/domain/model/LoginUser.java     | 9 +--------
 .../src/main/resources/mapper/system/SysUserMapper.xml   | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

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 b729b1ec2..8a81a2d6b 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,13 +9,9 @@ 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;
 
 /**
  * 登录用户身份权限
@@ -271,9 +267,6 @@ public class LoginUser implements UserDetails {
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        if (permissions == null || permissions.isEmpty()) {
-            return Collections.emptySet();
-        }
-        return permissions.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet());
+        return null;
     }
 }
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 2d8d6b974..c5f75dec9 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 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <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 id="deptResult" type="SysDept">