From cbdd0395d2801aaa1da1a5f05217d5eae36a4689 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 17:01:53 +0800 Subject: [PATCH] bug --- .../controller/datatower/WxUserStructureController.java | 1 - .../java/com/iformall/domain/dto/WxCUserBasicInfoDto.java | 4 +--- .../src/main/java/com/iformall/mapper/WxCUserCarMapper.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index e97bc9aa2..2f338740c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -195,7 +195,6 @@ public class WxUserStructureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); TenantEntity tenantEntity = ifParentUpdateTenantInfo(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(tenantEntity); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoService.findCount(tenantEntity,dto); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 6fd500578..faa65993f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,7 +1,6 @@ package com.iformall.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; @@ -19,7 +18,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) -public class WxCUserBasicInfoDto extends BaseEntity { +public class WxCUserBasicInfoDto extends TenantEntity { protected Long id; @@ -81,7 +80,6 @@ public class WxCUserBasicInfoDto extends BaseEntity { @TableField(exist = false) protected List filterList; - public void undateFinalTenantId(TenantEntity tenantEntity){ setFinalTenantId(tenantEntity.getTenantId()); if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java index 9810dfe45..8f9b90d88 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java @@ -12,7 +12,7 @@ public interface WxCUserCarMapper extends CommonMapper { List findList(WxCUserCar wxCUserCar); Integer countList(WxCUserCar wxCUserCar); - Integer countUser(WxCUserCar wxCUserCar); + Integer countUser(WxCUserBasicInfoDto dto); long queryCarCount(Map carParams);