diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/IndexQueryDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/IndexQueryDTO.java index 6f647e812..a1d906413 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/IndexQueryDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/IndexQueryDTO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.dto; +import com.jsowell.common.core.domain.BaseEntity; import lombok.Data; /** @@ -9,7 +10,7 @@ import lombok.Data; * @date 2023/2/3 16:11 */ @Data -public class IndexQueryDTO { +public class IndexQueryDTO extends BaseEntity { /** * 站点id */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 985725cda..3ce9641e9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -545,8 +545,13 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { */ @Override public IndexGeneralSituationVO getGeneralSituation(IndexQueryDTO dto) { - // - return pileBasicInfoMapper.getGeneralSituation(dto); + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + return new IndexGeneralSituationVO(); + } + dto.setStationDeptIds(authorizedMap.getStationDeptIds()); + dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); + return pileBasicInfoMapper.getGeneralSituation(dto); } /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml index b1e61959b..d574432d8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml @@ -319,9 +319,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) t4 WHERE t1.del_flag = '0' - - and t1.station_id = #{IndexQueryDTO.stationId,jdbcType=VARCHAR} - + + and t1.station_id = #{IndexQueryDTO.stationId,jdbcType=VARCHAR} + + + + and t1.station_id in + + #{stationDeptId} + + group by t4.totalMemberAmount diff --git a/jsowell-ui/src/views/homeIndex/homeIndex.vue b/jsowell-ui/src/views/homeIndex/homeIndex.vue index dfab340ba..5251f23a5 100644 --- a/jsowell-ui/src/views/homeIndex/homeIndex.vue +++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue @@ -62,7 +62,7 @@
- +

总客户余额