From 8743da85fb94dd7333cf99e8a3b0faf95d685c27 Mon Sep 17 00:00:00 2001
From: "517612449@qq.com" <liuhao1234>
Date: Thu, 14 Jul 2022 16:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventStyleServiceImpl.java                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java
index dd5b3e4..2c2ada1 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java
@@ -53,9 +53,9 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
         query.orderByDesc(EventStyle::getCreateTime);
         List<EventStyle> list;
         if ("banner".equals(type)) {
-            query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
+            query.eq(EventStyle::getCategory, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
         } else {
-            query.eq(EventStyle::getBanner, "0").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
+            query.eq(EventStyle::getCategory, "2").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
         }
         query.ne(EventStyle::getDeleteFlag, "1");
         list = this.list(query);
@@ -154,7 +154,7 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
                             .sendTime(s.getSendTime())
                             .build()));
         }
-        List<EventMaintainOutVO> collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getSendTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList());
+        List<EventMaintainOutVO> collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getCreateTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList());
         IPage<EventMaintainOutVO> iPage = new Page<>();
         iPage.setTotal(stylePage.getTotal());
         iPage.setPages(stylePage.getPages());