From b5e96d02fe1428354d281d3e04bcf2f4dec22db9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 27 Jul 2020 14:09:43 +0800
Subject: [PATCH] 修改拦截器和权限的bug

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
index bcd7ade..3f62c83 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
+++ b/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, "您的组织已经被禁用,请联系管理员")));
+//                        }
+//                    }
                 }
             }
         }

--
Gitblit v1.8.0