|
|
@@ -14,7 +14,7 @@ import com.uas.sso.SSOHelper;
|
|
|
import com.uas.sso.SSOToken;
|
|
|
import com.uas.sso.common.SSOProperties;
|
|
|
import com.uas.sso.common.util.HttpUtil;
|
|
|
-import com.uas.sso.entity.UserAccount;
|
|
|
+ import com.uas.sso.entity.UserAccount;
|
|
|
import com.uas.sso.web.spring.AbstractSSOInterceptor;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
@@ -278,10 +278,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if (user.getUserUU().equals(user.getEnterprise().getEnAdminuu())){
|
|
|
- user.setIssys(Constant.YES);
|
|
|
- }
|
|
|
- if (authorities == null) {
|
|
|
+ if (user.getEnterprise() != null && user.getUserUU().equals(user.getEnterprise().getEnAdminuu())) {
|
|
|
+ user.setIssys(Constant.YES);
|
|
|
+ }
|
|
|
+ if (authorities == null) {
|
|
|
authorities = new HashMap<Long, Collection<GrantedAuthority>>();
|
|
|
}
|
|
|
authorities.put(user.getUserUU(), authSet);
|