diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 142626146..cb8e39ac3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -132,8 +132,8 @@ public class WxMall extends BaseEntity { return single; } else { TenantEntity mul = new TenantEntity(); - mul.setTenantId(getParentTenantId()); - mul.setParentTenantId(getTenantId()); + mul.setTenantId(getTenantId()); + mul.setParentTenantId(getParentTenantId()); return mul; } } @@ -142,8 +142,8 @@ public class WxMall extends BaseEntity { if (StringUtils.isBlank(tenantInfo.getParentTenantId())) { setTenantId(tenantInfo.getTenantId()); } else { - setTenantId(tenantInfo.getParentTenantId()); - setParentTenantId(tenantInfo.getTenantId()); + setTenantId(tenantInfo.getTenantId()); + setParentTenantId(tenantInfo.getParentTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 64f05ec73..7fa6689b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -81,8 +81,8 @@ public class MallPermissionServiceImpl implements MallPermissionService { if (StringUtils.isBlank(userInfo.getParentTenantId())) { setTenantId(userInfo.getTenantId()); } else { - setTenantId(userInfo.getParentTenantId()); - setParentTenantId(userInfo.getTenantId()); + setTenantId(userInfo.getTenantId()); + setParentTenantId(userInfo.getParentTenantId()); } }}; String menus = wxMallMapper.queryMenusByTenantInfo(q); @@ -135,8 +135,8 @@ public class MallPermissionServiceImpl implements MallPermissionService { } else if (userInfo.checkAdmin()) { // 租户超管 WxMall q = new WxMall() {{ - setTenantId(userInfo.getParentTenantId()); - setParentTenantId(userInfo.getTenantId()); + setTenantId(userInfo.getTenantId()); + setParentTenantId(userInfo.getParentTenantId()); }}; String menus = wxMallMapper.queryMenusByTenantInfo(q); JSONArray menuIdList = JSON.parseArray(menus);