From f83498bedeca1b8824503a46ca3638b52300c95f Mon Sep 17 00:00:00 2001
From: liuh <gipsyliu@163.com>
Date: Wed, 29 Jun 2022 18:58: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         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 e1a7dab..247dfe9 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
@@ -41,15 +41,13 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
     @Override
     public Map<String, Integer> getPartyBranchMemberCount() {
         Map<String, Integer> map = new HashMap<>(2);
-        LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
-        queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
-        //查询党支部数量
-        int branchCount = this.count(queryBranch);
 
         LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery();
         queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1");
+        List<EventPartyBranch> list = this.list(queryMember);
         //查询党员总数量
-        int memberCount = this.count(queryMember);
+        int memberCount = list.size();
+        int branchCount = (int) list.stream().map(EventPartyBranch::getBelongBranchName).distinct().count();
 
         map.put("branch", branchCount);
         map.put("member", memberCount);