From 71ecdeceb82ee55becdb81a8d45f37c73c6567f6 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Wed, 01 Apr 2020 17:22:44 +0800
Subject: [PATCH] 1、kidgrow-code-generator Controller.java.vm 中优化List 接口,扩展ResultBody<PageResult> 2、kidgrow-springcloud-zuul 注释掉AmqpTemplate

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
index a7a8bd7..9a9c408 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/auth/Oauth2AuthSuccessHandler.java
+++ b/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()));

--
Gitblit v1.8.0