From 2380319f3db92a8c99e3b5b49baf35f1f979cbd6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 8 Jan 2021 18:37:05 +0800 Subject: [PATCH] cuser --- .../mem/WxCUserBasicInfoController.java | 2 +- .../iformall/domain/po/base/TenantEntity.java | 20 ++++++++++++++----- .../impl/WxCUserBasicInfoServiceImpl.java | 10 +++++----- .../mapper/WxCUserBasicInfoMapper.xml | 8 ++++---- 4 files changed, 25 insertions(+), 15 deletions(-) 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 315bab67b..84a8f02f3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -367,7 +367,7 @@ public class WxCUserBasicInfoController extends BaseController { } basicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); - wxCUserBasicInfoService.exportData(ifParentUpdateTenantInfo(),basicInfo, request, response); + wxCUserBasicInfoService.exportData(getTenantInfo(),basicInfo, request, response); } @RequestMapping("/exportTemplate") 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 afa5cf692..c674041f6 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 @@ -1,12 +1,10 @@ package com.iformall.domain.po.base; import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; -import com.iformall.domain.po.WxCUserBasicInfo; - /** * @author Stormeye * @date 2019/4/24 14:32 @@ -25,9 +23,14 @@ public class TenantEntity extends BaseEntity { @TableField(exist = false) protected String finalTenantId; + @JsonIgnore @TableField(exist = false) protected String shardTableSuffix; + @JsonIgnore + @TableField(exist = false) + protected String shardFinalTableSuffix; + public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); setParentTenantId(null); @@ -54,11 +57,18 @@ public class TenantEntity extends BaseEntity { } public String getShardTableSuffix() { - if(StringUtils.isNotBlank(tenantId)){ - shardTableSuffix = "_" + Integer.parseInt(this.getTenantId())%100; + if(StringUtils.isNotBlank(getTenantId())){ + shardTableSuffix = "_" + Integer.parseInt(getTenantId())%100; } return shardTableSuffix; } + + public String getShardFinalTableSuffix(){ + if(StringUtils.isNotBlank(getFinalTenantId())){ + shardFinalTableSuffix = "_" + Integer.parseInt(getFinalTenantId())%100; + } + return shardFinalTableSuffix; + } public String getTenantId() { 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 b128b5f97..219fcef87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1274,11 +1274,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc List list = new ArrayList(); basicInfo.setBegin((page-1)*10000); basicInfo.setLimit(10000); - if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ - //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); - }else{ - basicInfo.undateFinalTenantId(tenantInfo); - } +// if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ +// //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); +// }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 e36d32813..21f8644c9 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -822,8 +822,8 @@