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 getEventDeclarationList() { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").isNotNull(EventPartyBranch::getEventDeclaration); - List list = this.list(); + List list = this.list(query); if (list.isEmpty()) { return new ArrayList<>(); } @@ -62,7 +62,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl memberList = this.list(queryMember); Map> 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 w.like(EventPartyBranch::getContactName, param) + .or().like(EventPartyBranch::getContactMobiphone, param) + .or().like(EventPartyBranch::getContactEmail, param)); return this.list(queryMember); }