diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 394de169d..f3d6e4c22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -2,6 +2,8 @@ package com.iformall.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +17,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfoDto extends BaseTenantEntity { +public class WxCUserBasicInfoDto extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java index 53df7b843..c5ac32ef3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBuser.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +23,7 @@ import java.util.UUID; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxBuser extends BaseTenantEntity { +public class WxBuser extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 40827c8e6..ceed2dd95 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -19,7 +21,7 @@ import java.util.Objects; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfo extends BaseTenantEntity { +public class WxCUserBasicInfo extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index 1c7462c88..ac6a857ef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -2,6 +2,8 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +12,7 @@ import java.util.*; @TableName(value = "wx_c_user_car") @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserCar extends BaseTenantEntity { +public class WxCUserCar extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 3440e20d4..085d1b320 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -19,6 +19,7 @@ public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") private String parentTenantId; @@ -27,6 +28,7 @@ public class BaseTenantEntity extends BaseEntity { private TenantEntity tenantInfo; public void updateTenantInfo(TenantEntity info) { + log.info("info.tenantId:"+info.getTenantId()+". info.parentTenantId:"+info.getParentTenantId()+"."); setTenantId(info.getTenantId()); if (StringUtils.isNotBlank(info.getParentTenantId())) { setParentTenantId(info.getParentTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 625cc1b3e..655364047 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -30,4 +30,11 @@ public class TenantEntity extends BaseEntity { setParentTenantId(info.getParentTenantId()); } } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + setParentTenantId(parentTenantId); + }}; + } }