Explorar el Código

修改集团版字段

release_toaliyun_real
xhxu hace 6 años
padre
commit
ea338d5f61
Se han modificado 2 ficheros con 8 adiciones y 8 borrados
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxMall.java Ver fichero

@@ -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());
}
}



+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Ver fichero

@@ -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);


Cargando…
Cancelar
Guardar