Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -157,9 +157,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
             if (user != null) {
                 user.setIp(AgentUtils.getIp(request));
                 request.getSession().setAttribute("user", user);
-                setGrantedAuthorities(user);
             }
         }
+        setGrantedAuthorities(user);
         if (user != null) {
             SystemSession.setUser(user);
             accessDecision(request, user);
@@ -176,7 +176,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         }
         Iterator<ConfigAttribute> iterator = configAttributes.iterator();
         String needPermission = null;
-        if (!authorities.containsKey(user.getUserUU())) {
+        if (null == authorities || !authorities.containsKey(user.getUserUU())) {
             setGrantedAuthorities(user);
         }
         Collection<GrantedAuthority> userAuthorities = authorities.get(user.getUserUU());