修改拦截器和权限的bug

zhaoxiaohao

2020-07-27 b5e96d02fe1428354d281d3e04bcf2f4dec22db9

修改拦截器和权限的bug

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java

@@ -68,7 +68,17 @@
        } else {
            if (sysUserOrg.getUserId() != null) {
                String createUserOrgCode = "";
                List<SysOrganization> userOrgData = sysUser.getOrganizations();
                List<SysOrganization> userOrgData = new ArrayList<>();
                SysOrganization byId = sysOrganizationService.getById(sysUserOrg.getOrgId());
                if(byId==null){
                    return ResultBody.failed().data(null).msg("该组织id异常");
                }
                SysOrganization parentId = sysOrganizationService.getById(byId.getOrgParentId());
                userOrgData.add(parentId);
                userOrgData.add(byId);
                if(parentId==null){
                    return ResultBody.failed().data(null).msg("该组织id异常");
                }
                if (userOrgData != null) {
                    if (userOrgData.size() == 2) {
                        createUserOrgCode = userOrgData.get(1).getOrgCode();
@@ -96,9 +106,7 @@
                                }else {
                                    userOrgList.get(i).setFromId(null);
                                }
                            }
                            else
                            {
                            } else {
                                QueryWrapper queryWrapper=new QueryWrapper();
                                queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del",0);

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

@@ -89,15 +89,16 @@
                    if (sysUserOrgs == null || sysUserOrgs.isEmpty()) {
                        ctx.setSendZuulResponse(false);
                        ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
                    } else {
                        List<Long> collect = sysUserOrgs.stream().map(e -> e.getOrgId()).collect(Collectors.toList());
                        List<SysOrganization> sysOrganizations = getSysOrganization();
                        List<Long> orgIds = sysOrganizations.stream().filter(e -> e.getEnabled() == true && collect.contains(e.getId())).map(e -> e.getId()).collect(Collectors.toList());
                        if (orgIds == null || orgIds.size() <= 0) {
                            ctx.setSendZuulResponse(false);
                            ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
                        }
                    }
//                    else {
//                        List<Long> collect = sysUserOrgs.stream().map(e -> e.getOrgId()).collect(Collectors.toList());
//                        List<SysOrganization> sysOrganizations = getSysOrganization();
//                        List<Long> orgIds = sysOrganizations.stream().filter(e -> e.getEnabled() == true && collect.contains(e.getId())).map(e -> e.getId()).collect(Collectors.toList());
//                        if (orgIds == null || orgIds.size() <= 0) {
//                            ctx.setSendZuulResponse(false);
//                            ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
//                        }
//                    }
                }
            }
        }