From 8e65a99d4b7bfc20b5837560f8f406166e9d8b5a Mon Sep 17 00:00:00 2001
From: "517612449@qq.com" <liuhao1234>
Date: Thu, 23 Jun 2022 15:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PartyMemberEventController.java         |  2 +-
 .../service/impl/EventPartyBranchServiceImpl.java      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java
index 1027ada..13c5b22 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java
@@ -15,7 +15,7 @@ import java.util.Map;
 
 @RestController
 @Api(tags = "党员活动接口")
-@RequestMapping("/api/eventpartybranch")
+@RequestMapping("/v1/eventpartybranch")
 public class PartyMemberEventController {
 
     @Resource
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 e6d4c4e..b280798 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
@@ -25,7 +25,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
     public List<String> getEventDeclarationList() {
         LambdaQueryWrapper<EventPartyBranch> query = Wrappers.lambdaQuery();
         query.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").isNotNull(EventPartyBranch::getEventDeclaration);
-        List<EventPartyBranch> list = this.list();
+        List<EventPartyBranch> list = this.list(query);
         if (list.isEmpty()) {
             return new ArrayList<>();
         }
@@ -62,7 +62,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
         List<EventPartyBranch> memberList = this.list(queryMember);
         Map<String, List<EventPartyBranch>> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranch));
 
-        list.forEach(f -> f.setCount(listMap.get(f.getBelongBranch()).size()));
+        list.forEach(f -> f.setCount(listMap.get(f.getId()) == null ? 0 : listMap.get(f.getId()).size()));
 
         return list.stream().sorted(Comparator.comparing(EventPartyBranch::getCount).reversed()).collect(Collectors.toList());
     }
@@ -80,9 +80,9 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
         queryMember.eq(EventPartyBranch::getType, "2")
                 .eq(EventPartyBranch::getStatus, "1")
                 .eq(EventPartyBranch::getBelongBranch, belongBranch)
-                .like(EventPartyBranch::getContactName,param)
-                .like(EventPartyBranch::getContactMobiphone,param)
-                .like(EventPartyBranch::getContactEmail,param);
+                .and(w -> w.like(EventPartyBranch::getContactName, param)
+                        .or().like(EventPartyBranch::getContactMobiphone, param)
+                        .or().like(EventPartyBranch::getContactEmail, param));
         return this.list(queryMember);
     }