From f6fa92768b7117fceb1c414508582d2d0d77ae45 Mon Sep 17 00:00:00 2001
From: liuh <gipsyliu@163.com>
Date: Wed, 29 Jun 2022 19:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventPartyBranchServiceImpl.java            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java
index 247dfe9..bcd3d7f 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java
@@ -47,7 +47,10 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
         List<EventPartyBranch> list = this.list(queryMember);
         //查询党员总数量
         int memberCount = list.size();
-        int branchCount = (int) list.stream().map(EventPartyBranch::getBelongBranchName).distinct().count();
+
+
+        Map<String, List<EventPartyBranch>> listMap = list.stream().collect(Collectors.groupingBy(EventPartyBranch::getBranchCode));
+        int branchCount = listMap.keySet().stream().mapToInt(k -> (int) listMap.get(k).stream().map(EventPartyBranch::getBelongBranchName).distinct().count()).sum();
 
         map.put("branch", branchCount);
         map.put("member", memberCount);