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 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 collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getSendTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList()); + List collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getCreateTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList()); IPage iPage = new Page<>(); iPage.setTotal(stylePage.getTotal()); iPage.setPages(stylePage.getPages());