From 8d7d1580e3615465032a0582f2b43b5c087fb124 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Fri, 16 May 2025 11:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/impl/FranchiseReportServiceImpl.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
index b7a018798..f38099ef4 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
@@ -155,7 +155,12 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
             }
         }
 
-        List<FranchiseReportResponse> list = new ArrayList<>(responseByRegionIdMap.values());
+        List<FranchiseReportResponse> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) {
+            list.addAll(responseByJoinGroupNameMap.values());
+        }else{
+            list.addAll(responseByRegionIdMap.values());
+        }
         if (CollectionUtils.isEmpty(list)) {
             log.info("数据为空");
             return Collections.emptyList();