diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 3299d65e4..7dafae748 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -64,7 +64,6 @@ public class WxLevelConfigController extends BaseController { public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { - if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } @@ -98,7 +97,7 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-删除") public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); - if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxLevelConfigService.deleteById(wxLevelConfig.getId()); diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 74b4a2dc1..2dbbdf520 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -146,10 +146,10 @@ - and wcu.`tenant_id` = #{tenantId} + and wcu.`tenant_id` = #{tenantInfo.tenantId} - and wcu.`parent_tenant_id` = #{parentTenantId} + and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} @@ -611,10 +611,10 @@ and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} - and wcubi.create_date >= #{startTime} + and wcubi.create_date >= #{basicInfo.startTime} - and wcubi.create_date < #{endTime} + and wcubi.create_date < #{basicInfo.endTime} group by wcubi.reportTime diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 3655d41c1..97d38b187 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -28,9 +28,6 @@ and wlc.`tenant_id` = #{tenantId} - - and wm.`parent_tenant_id` = #{parentTenantId} - and wlc.`points` = #{points} @@ -70,7 +67,6 @@ select from wx_level_config wlc - left join wx_mall wm on wm.tenant_id = wlc.tenant_id