From 17370fbe52097dc026afcddc71bd0e3125491e09 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 30 Jun 2020 17:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=89=88=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/base/BaseController.java | 15 ++++----------- .../iformall/controller/sys/HomeController.java | 7 ++++--- .../main/java/com/iformall/shiro/UserSession.java | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index f3146c52f..4a155946c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -7,10 +7,8 @@ import java.util.Date; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumGroupSupport; import com.iformall.shiro.UserSession; import com.iformall.utils.IPUtil; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.springframework.web.bind.WebDataBinder; @@ -66,18 +64,13 @@ public class BaseController { * @return */ public TenantEntity getTenantInfo(){ - TenantEntity tenantEntity = new TenantEntity(); Session session = SecurityUtils.getSubject().getSession(); - Boolean isParent = (Boolean)session.getAttribute(UserSession.isParent); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - if(isParent!= null && isParent){ - tenantEntity.setTenantId(null); - tenantEntity.setParentTenantId(tenantId); - }else{ - tenantEntity.setTenantId(tenantId); - tenantEntity.setParentTenantId(parentTenantId); - } + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + setParentTenantId(parentTenantId); + }}; return tenantEntity; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index d9d6edb23..d1b878324 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -163,7 +163,8 @@ public class HomeController extends BaseController { StringUtils.isBlank(info.getParentTenantId())) { Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.isParent, true); + session.setAttribute(UserSession.tenantId, null); + session.setAttribute(UserSession.parentTenantId, info.getTenantId()); // 集团用户获取子商场 List mallList = mallService.getSubByParentTenantId(info.getTenantId()); @@ -216,8 +217,8 @@ public class HomeController extends BaseController { session.setAttribute(UserSession.tenantId, subTenantId); session.setAttribute(UserSession.parentTenantId, tenantId); } else { - session.setAttribute(UserSession.tenantId, tenantId); - session.setAttribute(UserSession.parentTenantId, null); + session.setAttribute(UserSession.tenantId, null); + session.setAttribute(UserSession.parentTenantId, tenantId); } } return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java b/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java index e8c9c9d68..7d9a25e11 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/UserSession.java @@ -10,6 +10,4 @@ public class UserSession { public static String parentTenantId ="PARENT_TENANT_ID"; - public static String isParent ="IS_PARENT"; - }