Sfoglia il codice sorgente

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohanzi 5 anni fa
parent
commit
1139fb1930
2 ha cambiato i file con 7 aggiunte e 1 eliminazioni
  1. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java

+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java Vedi File

@@ -69,6 +69,12 @@ public class MyShiroRealm extends AuthorizingRealm {
session.setAttribute(UserSession.tenantId, user.getTenantId()); session.setAttribute(UserSession.tenantId, user.getTenantId());
if (StringUtils.isNotBlank(user.getParentTenantId())) { if (StringUtils.isNotBlank(user.getParentTenantId())) {
session.setAttribute(UserSession.parentTenantId, 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; return authenticationInfo;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Vedi File

@@ -1269,7 +1269,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
if (null != userIds && userIds.size() > 0 ) { if (null != userIds && userIds.size() > 0 ) {
WxCUserTags tq = new WxCUserTags(); WxCUserTags tq = new WxCUserTags();
tq.setUserIdList(userIds); tq.setUserIdList(userIds);
tq.setTenantId(tenantInfo.getFinalTenantId());
tq.setTenantId(tenantInfo.getFinalTenantId());
List<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq); List<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq);
if (null != userTagList) { if (null != userTagList) {
List<WxTags> tagList = wxTagsMapper.findListAll(); List<WxTags> tagList = wxTagsMapper.findListAll();


Caricamento…
Annulla
Salva