From 94745d5ba6e87a80cb6bf21bbeba966181e76d02 Mon Sep 17 00:00:00 2001
From: "517612449@qq.com" <liuhao1234>
Date: Mon, 27 Jun 2022 16:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventContactServiceImpl.java                 | 4 +++-
 .../service/impl/EventPartyBranchServiceImpl.java             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java
index 6baf960..4e6da4e 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java
@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventContactMapper;
 import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact;
+import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch;
 import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -26,7 +28,7 @@ public class EventContactServiceImpl extends ServiceImpl<EventContactMapper, Eve
     public Map<String, List<EventContact>> getEventContactGroup() {
         LambdaQueryWrapper<EventContact> query = Wrappers.lambdaQuery();
         query.eq(EventContact::getStatus, "1");
-        return this.list(query).stream().collect(Collectors.groupingBy(EventContact::getContactUnit));
+        return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit));
     }
 
     @Override
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 4dad677..a5e0fa5 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
@@ -66,7 +66,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
 
         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());
+        return list.stream().sorted(Comparator.comparing(EventPartyBranch::getSort)).collect(Collectors.toList());
     }
 
     @Override