From e8b892dfed1afd907b7d257e42bbd15bb40db5c6 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 03 Apr 2020 15:32:29 +0800
Subject: [PATCH] 1.为所有的生成的*Mapper.xml文件中的findbyobject增加  limit 1代码 2.为所有的*Mapper.java文件中的 findbyobject方法的参数增加前缀 @Param("p") 3.调整了organization 以及userorg的实体引用(从common中的model中引用)

---
 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