forked from kidgrow-microservices-platform
parent: d7d9278b | patch | commit | show whitespace
克 刘
2020-04-10 9481bba85450164a1e402de7e383389decd46388 
Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
2 files modified
2 ■■■■■ changed files
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml 1 ●●●●● patch | view | raw | blame | history
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java 1 ●●●●● patch | view | raw | blame | history 
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml


@@ -88,5 +88,6 @@


    LEFT JOIN sys_organization org ON uo.org_id = org.id


    AND (uo.enabled = TRUE AND uo.is_del = FALSE) AND (org.is_del = FALSE AND org.enabled = TRUE)


    where uo.user_id=#{userId}


    order by org_level


    </select>


</mapper>




 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java


@@ -62,6 +62,7 @@


                SysUser user = (SysUser)authentication.getPrincipal();


                ctx.addZuulRequestHeader(SecurityConstants.USER_ID_HEADER, String.valueOf(user.getId()));


                ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername());


                ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME, "");//待完善


                List<SysOrganization> organizations = (List<SysOrganization>)user.getOrganizations();


                //如果有组织架构


                if(organizations!=null && organizations.size()==2){