浏览代码

Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

James 1 年之前
父节点
当前提交
1fdd0488a3

+ 1 - 1
service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteArticleServiceImpl.java

@@ -62,7 +62,7 @@ public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMappe
         queryWrapper.in(CollectionUtil.isNotEmpty(categoryidList), SiteArticle::getCategoryid, categoryidList)
                 .eq(id != null, SiteArticle::getId, id)
                 .like(StringUtils.isNotBlank(title), SiteArticle::getTitle, title)
-                .orderByDesc(SiteArticle::getIstop, SiteArticle::getId);
+                .orderByDesc(SiteArticle::getIstop).orderByAsc(SiteArticle::getSortindex, SiteArticle::getId);
         page = this.page(page, queryWrapper);
 
         for (int i = 0; i < page.getRecords().size(); i++) {