From 6b24a2ce2d1f64abea46bfee099d75e45afd23b5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 19 Nov 2020 18:01:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?exportData=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 32e7a1ce1..07485e8f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1269,6 +1269,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc if (null != userIds && userIds.size() > 0 ) { WxCUserTags tq = new WxCUserTags(); tq.setUserIdList(userIds); + tq.setTenantId(tenantInfo.getFinalTenantId()); List userTagList = wxCUserTagsMapper.findList(tq); if (null != userTagList) { List tagList = wxTagsMapper.findListAll(); From 26bd177f3dd62a74085405bcc7c28443883caaaf Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 20 Nov 2020 10:17:50 +0800 Subject: [PATCH 2/2] session bug --- .../src/main/java/com/iformall/shiro/MyShiroRealm.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index 0ab445f19..2689cc3c8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -69,6 +69,12 @@ public class MyShiroRealm extends AuthorizingRealm { session.setAttribute(UserSession.tenantId, user.getTenantId()); if (StringUtils.isNotBlank(user.getParentTenantId())) { session.setAttribute(UserSession.parentTenantId, user.getParentTenantId()); + }else{ + session.setAttribute(UserSession.parentTenantId, null); +// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); +// if(StringUtils.isNotBlank(parentTenantId)){ +// session.removeAttribute(UserSession.parentTenantId); +// } } return authenticationInfo;