Merge remote-tracking branch 'origin/develop' into develop

This reverts commit 0e69a01120.

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;
     }
 }

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">