forked from kidgrow-microservices-platform

克 刘
2020-04-01 04bc99edc71ab3efca8b969394d6bc608362120f
修复UserInfoHeaderFilter中增加 组织架构为Null验证
2 files modified
4 ■■■■ changed files
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java 2 ●●● patch | view | raw | blame | history
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java 2 ●●● patch | view | raw | blame | history
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
@@ -38,7 +38,7 @@
            List<SysOrganization> organizations = (List<SysOrganization>)user.getOrganizations();
            //如果有组织架构
            if(organizations.size()==2){
            if(organizations!=null && organizations.size()==2){
                headerValues.add(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
                headerValues.add(SecurityConstants.USER_ORG_NAME_HEADER,organizations.get(0).getOrgName());
                headerValues.add(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(organizations.get(1).getId()));
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -64,7 +64,7 @@
                ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername());
                List<SysOrganization> organizations = (List<SysOrganization>)user.getOrganizations();
                //如果有组织架构
                if(organizations.size()==2){
                if(organizations!=null && organizations.size()==2){
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER,organizations.get(0).getOrgName());
                    ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(organizations.get(1).getId()));