From fbf6a877aae46e19a8d3c0058cefa3f81c72715f Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 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 e617f84..e4a084b 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
@@ -91,7 +91,7 @@
ctx.setSendZuulResponse(false);
ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
// String str = new String("您的组织已经被禁用，请联系管理员".getBytes("utf-8"), "utf-8");
- ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用1，请联系管理员")));
+ ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
} else {
// List<Long> collect = sysUserOrgs.stream().map(e -> e.getOrgId()).collect(Collectors.toList());
// List<SysOrganization> sysOrganizations = getSysOrganization();
@@ -100,35 +100,29 @@
// ctx.setSendZuulResponse(false);
// ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
// }
- //根据fegin客户端查询状态
- Map<String, Object> map;
- for (SysUserOrg sysUserOrg : sysUserOrgs) {
- map = new HashMap<>();
- map.put("id", sysUserOrg.getOrgId());
- List<SysOrganization> sysOrganizations = JSON.parseArray(JSON.toJSONString(sysOrganizationService.getListByMap(map).getData()), SysOrganization.class);
- System.out.println("5555555555555555");
- System.out.println(sysOrganizations.size());
- for (SysOrganization sysOrganization : sysOrganizations) {
- System.out.println(sysOrganization.getOrgName());
- }
- System.out.println("66666666666");
- if (sysOrganizations == null || sysOrganizations.size() <= 0) {
- ctx.setSendZuulResponse(false);
- ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
- ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用2，请联系管理员")));
- } else {
- for (SysOrganization sysOrganization : sysOrganizations) {
- if (!sysOrganization.getEnabled() || sysOrganization.getIsDel()) {
- ctx.setSendZuulResponse(false);
- ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
- ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用3，请联系管理员")));
+ if (!request.getRequestURI().contains("ReportRecord/getImg")) {
+ //根据fegin客户端查询状态
+ Map<String, Object> map;
+ for (SysUserOrg sysUserOrg : sysUserOrgs) {
+ map = new HashMap<>();
+ map.put("id", sysUserOrg.getOrgId());
+ List<SysOrganization> sysOrganizations = JSON.parseArray(JSON.toJSONString(sysOrganizationService.getListByMap(map).getData()), SysOrganization.class);
+ if (sysOrganizations == null || sysOrganizations.size() <= 0) {
+ ctx.setSendZuulResponse(false);
+ ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
+ ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
+ } else {
+ for (SysOrganization sysOrganization : sysOrganizations) {
+ if (!sysOrganization.getEnabled() || sysOrganization.getIsDel()) {
+ ctx.setSendZuulResponse(false);
+ ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
+ ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
+ }
}
}
}
}
-
}
-// }
}
}
return null;
@@ -143,12 +137,6 @@
public List<SysUserOrg> getSysUserOrg(Long str) {
//获取组织 Redis中获取
List<SysUserOrg> sysUserOrgs = JSON.parseArray(JSON.toJSONString(redisUtils.hget(RedisConstant.USER_ORGANIZATION, str.toString())), SysUserOrg.class);
- System.out.println("3333333333333333333333");
- System.out.println(sysUserOrgs.size());
- for (SysUserOrg sysUserOrg : sysUserOrgs) {
- System.out.println(sysUserOrg.getFromLevel());
- }
- System.out.println("444444444444444444");
if (sysUserOrgs == null || sysUserOrgs.size() <= 0) {
//在数据库查询
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0