Merge branch 'feature' into 'release'

2023/09/19 公告列表增加排序

See merge request !392

src/main/java/com/zhiwei/brandkbs2/service/impl/NoticeInfoServiceImpl.java

@@ -81,6 +81,7 @@ public class NoticeInfoServiceImpl implements NoticeInfoService {
         if (StringUtils.isNotBlank(keyword)) {
             noticeInfoDao.addKeywordFuzz(query, keyword, "title");
         }
+        query.with(Sort.by(Sort.Direction.DESC, "cTime"));
         long total = noticeInfoDao.count(query);
         mongoUtil.start(page, size, query);
         List<NoticeInfo> noticeInfoList = noticeInfoDao.findList(query);
@@ -112,6 +113,7 @@ public class NoticeInfoServiceImpl implements NoticeInfoService {
         Query query = new Query();
         query.addCriteria(Criteria.where("start").is(true));
         query.addCriteria(Criteria.where("show").is(true));
+        query.with(Sort.by(Sort.Direction.DESC, "cTime"));
         long total = noticeInfoDao.count(query);
         mongoUtil.start(page, size, query);
         List<NoticeInfo> noticeInfoList = noticeInfoDao.findList(query);