From 8c72cb3ecd8829d4cdaa4a5b6d5e29d2de03a27b Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 20 Jan 2022 14:54:11 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81tenant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/base/BaseTenantEntity.java | 2 +- .../java/com/iformall/domain/po/base/TenantEntity.java | 2 +- .../src/main/resources/mapper/TtCUserMapper.xml | 8 ++++---- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 6 +++--- .../src/main/resources/mapper/WxCUserMapper.xml | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) 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 06b8f2fb0..fd62605bc 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 @@ -27,10 +27,10 @@ public class BaseTenantEntity extends BaseEntity { protected String finalTenantId; public String getFinalTenantId() { + finalTenantId = tenantId; if (StringUtils.isNotBlank(parentTenantId)) { finalTenantId = parentTenantId; } - finalTenantId = tenantId; return finalTenantId; } 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 ef9986643..302444e92 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 @@ -44,10 +44,10 @@ public class TenantEntity extends BaseEntity { } public String getFinalTenantId() { + finalTenantId = tenantId; if (StringUtils.isNotBlank(parentTenantId)) { finalTenantId = parentTenantId; } - finalTenantId = tenantId; return finalTenantId; } diff --git a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml index 1850a14c2..f668a71cf 100644 --- a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml @@ -319,16 +319,16 @@ - select count(id) as incCount, - date_format(create_date, '%Y-%m-%d') as reportTime, + date_format(create_date, '%Y-%m-%d') as reportTime - date_format(create_date, '%Y-%m') as reportTime, + date_format(create_date, '%Y-%m') as reportTime - date_format(create_date, '%Y') as reportTime, + date_format(create_date, '%Y') as reportTime from tt_c_user diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 085ea0100..4692d1e1a 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -307,13 +307,13 @@ - select count(id) as incCount, - date_format(create_date, '%Y-%m-%d') as reportTime, + date_format(create_date, '%Y-%m-%d') as reportTime - date_format(create_date, '%Y-%m') as reportTime, + date_format(create_date, '%Y-%m') as reportTime - date_format(create_date, '%Y') as reportTime, + date_format(create_date, '%Y') as reportTime from wx_c_user where `tenant_id` = #{tenantId}