From e9ac526b694f86697efc0a798d43b4e5605e39fe Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 9 Mar 2023 15:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/pile/dto/IndexQueryDTO.java    |  3 ++-
 .../pile/service/impl/PileBasicInfoServiceImpl.java |  9 +++++++--
 .../resources/mapper/pile/PileBasicInfoMapper.xml   | 13 ++++++++++---
 jsowell-ui/src/views/homeIndex/homeIndex.vue        |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

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'
-        <if test="IndexQueryDTO.stationId != null and IndexQueryDTO.stationId != ''">
-            and t1.station_id = #{IndexQueryDTO.stationId,jdbcType=VARCHAR}
-        </if>
+            <if test="IndexQueryDTO.stationId != null and IndexQueryDTO.stationId != ''">
+                and t1.station_id = #{IndexQueryDTO.stationId,jdbcType=VARCHAR}
+            </if>
+            <!-- 数据范围过滤 -->
+            <if test="IndexQueryDTO.stationDeptIds != null and IndexQueryDTO.stationDeptIds.size() != 0">
+                and t1.station_id in
+                <foreach collection="IndexQueryDTO.stationDeptIds" item="stationDeptId" open="(" separator="," close=")">
+                    #{stationDeptId}
+                </foreach>
+            </if>
         group by t4.totalMemberAmount
     </select>
 
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 @@
           <div class="progress"></div>
         </div>
       </el-col>
-      <el-col :span="7">
+      <el-col :span="7" v-hasRole="['admin', 'common']">
         <div class="box">
           <p>总客户余额</p>
           <div class="box-text">