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..4fc843e 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 @@ -9,6 +9,7 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; 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 +27,7 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup() { LambdaQueryWrapper 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 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