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 727514a05..8ab9d34a8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -32,6 +32,17 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @io.swagger.annotations.ApiModelProperty(value="如果是集团版的,存集团版的tenantId,如果是商场,则存商场",name="sex") private String finalTenantId; + @JsonIgnore + @TableField(exist = false) + protected String shardFinalTableSuffix; + + public String getShardFinalTableSuffix(){ + if(StringUtils.isNotBlank(finalTenantId)){ + shardFinalTableSuffix = "_" + Integer.parseInt(finalTenantId)%100; + } + return shardFinalTableSuffix; + } + @Excel(name="姓名",width = 20,orderNum = "1") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") 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 c674041f6..4736492f3 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 @@ -27,10 +27,6 @@ public class TenantEntity extends BaseEntity { @TableField(exist = false) protected String shardTableSuffix; - @JsonIgnore - @TableField(exist = false) - protected String shardFinalTableSuffix; - public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); setParentTenantId(null); @@ -62,14 +58,6 @@ public class TenantEntity extends BaseEntity { } return shardTableSuffix; } - - public String getShardFinalTableSuffix(){ - if(StringUtils.isNotBlank(getFinalTenantId())){ - shardFinalTableSuffix = "_" + Integer.parseInt(getFinalTenantId())%100; - } - return shardFinalTableSuffix; - } - public String getTenantId() { return tenantId; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 219fcef87..12b8000c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1279,6 +1279,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // }else{ // basicInfo.undateFinalTenantId(tenantInfo); // } + list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); if (null == list || list.size() <= 0 ) { return null; diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 21f8644c9..004346fe9 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -822,8 +822,8 @@