|
|
|
@@ -28,28 +28,27 @@ public class TenantEntity extends BaseEntity { |
|
|
|
protected String shardTableSuffix; |
|
|
|
|
|
|
|
public void updateTenantInfo(TenantEntity info) { |
|
|
|
setTenantId(info.getTenantId()); |
|
|
|
setParentTenantId(null); |
|
|
|
tenantId = info.getTenantId(); |
|
|
|
if (StringUtils.isNotBlank(info.getParentTenantId())) { |
|
|
|
setParentTenantId(info.getParentTenantId()); |
|
|
|
parentTenantId = info.getParentTenantId(); |
|
|
|
} |
|
|
|
setFinalTenantId(getFinalTenantId()); |
|
|
|
getFinalTenantId(); |
|
|
|
} |
|
|
|
|
|
|
|
public void updateTenantInfo(BaseTenantEntity info) { |
|
|
|
setTenantId(info.getTenantId()); |
|
|
|
setParentTenantId(null); |
|
|
|
if (StringUtils.isNotBlank(info.getParentTenantId())) { |
|
|
|
setParentTenantId(info.getParentTenantId()); |
|
|
|
} |
|
|
|
setFinalTenantId(getFinalTenantId()); |
|
|
|
tenantId = info.getTenantId(); |
|
|
|
if (StringUtils.isNotBlank(info.getParentTenantId())) { |
|
|
|
parentTenantId = info.getParentTenantId(); |
|
|
|
} |
|
|
|
getFinalTenantId(); |
|
|
|
} |
|
|
|
|
|
|
|
public String getFinalTenantId() { |
|
|
|
if (!StringUtils.isBlank(parentTenantId)) { |
|
|
|
return parentTenantId; |
|
|
|
if (StringUtils.isNotBlank(parentTenantId)) { |
|
|
|
finalTenantId = parentTenantId; |
|
|
|
} |
|
|
|
return tenantId; |
|
|
|
finalTenantId = tenantId; |
|
|
|
return finalTenantId; |
|
|
|
} |
|
|
|
|
|
|
|
public String getShardTableSuffix() { |
|
|
|
@@ -65,7 +64,6 @@ public class TenantEntity extends BaseEntity { |
|
|
|
|
|
|
|
public void setTenantId(String tenantId) { |
|
|
|
this.tenantId = tenantId; |
|
|
|
setFinalTenantId(getFinalTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
public String getParentTenantId() { |
|
|
|
@@ -74,7 +72,6 @@ public class TenantEntity extends BaseEntity { |
|
|
|
|
|
|
|
public void setParentTenantId(String parentTenantId) { |
|
|
|
this.parentTenantId = parentTenantId; |
|
|
|
setFinalTenantId(getFinalTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
public void setFinalTenantId(String finalTenantId) { |
|
|
|
|