From 174ad03730db4271c19839e98f1cc61582c10827 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 23 Oct 2020 11:34:53 +0800 Subject: [PATCH] fix bug --- .../mem/WxCUserBasicInfoController.java | 1 + .../iformall/domain/po/WxCUserBasicInfo.java | 3 +- .../TenantEntityWithoutFinalTenantId.java | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index bbaff64b6..a7be97322 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -201,6 +201,7 @@ public class WxCUserBasicInfoController extends BaseController { wxCUserTagsService.saveOrUpdate(record); wxCUserBasicInfo.setTagId(record.getId()); } + wxCUserBasicInfo.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoService.update(wxCUserBasicInfo); wxCUserBasicInfo.updateTenantInfo(oldInfo); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); 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 54743e1ec..8546f0dec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.base.TenantEntityWithoutFinalTenantId; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +23,7 @@ import java.util.Objects; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfo extends TenantEntity { +public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java new file mode 100644 index 000000000..741d21cca --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java @@ -0,0 +1,51 @@ +package com.iformall.domain.po.base; + +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; + +/** + * @author Stormeye + * @date 2019/4/24 14:32 + */ +@EqualsAndHashCode(callSuper = true) +public class TenantEntityWithoutFinalTenantId extends BaseEntity { + private static final long serialVersionUID = 1441638860618733611L; + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + protected String tenantId; + + @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") + protected String parentTenantId; + + public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { + setTenantId(info.getTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); + } + } + + public void updateTenantInfo(BaseTenantEntity info) { + setTenantId(info.getTenantId()); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); + } + } + + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getParentTenantId() { + return parentTenantId; + } + + public void setParentTenantId(String parentTenantId) { + this.parentTenantId = parentTenantId; + } + +}