'优化官网-内容管理查询接口，新增排序字段，不传默认按照创建时间倒序排，传sortindex，就按照内容排序字段排序'

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteArticleController.java

@@ -36,9 +36,10 @@ public class SiteArticleController {
     public ApiResult<CommonPage<SiteArticle>> siteArticleList(@RequestParam(value = "categoryid", required = false) Integer categoryid,
                                                               @RequestParam(value = "id", required = false) Integer id,
                                                               @RequestParam(value = "title", required = false) String title,
+                                                              @RequestParam(value = "order", required = false) String order,
                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(siteArticleService.siteArticleList(categoryid, id, title, pageNum, pageSize));
+        return ApiResult.success(siteArticleService.siteArticleList(categoryid, id, title, order, pageNum, pageSize));
     }
 
     /**

service-website/service-website-biz/src/main/java/com/usky/website/service/SiteArticleService.java

@@ -23,7 +23,7 @@ public interface SiteArticleService extends CrudService<SiteArticle> {
      * @param pageSize   每页条数
      * @return
      */
-    CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize);
+    CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, String order, Integer pageNum, Integer pageSize);
 
     /**
      * 官网-内容的新增

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

@@ -35,7 +35,7 @@ public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMappe
     private SiteCategoryMapper siteCategoryMapper;
 
     @Override
-    public CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize) {
+    public CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, String order, Integer pageNum, Integer pageSize) {
         IPage<SiteArticle> page = new Page<>(pageNum, pageSize);
         List<Integer> categoryidList = new ArrayList<>();
         if (categoryid != null && categoryid != 0) {
@@ -61,8 +61,13 @@ public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMappe
         LambdaQueryWrapper<SiteArticle> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(CollectionUtil.isNotEmpty(categoryidList), SiteArticle::getCategoryid, categoryidList)
                 .eq(id != null, SiteArticle::getId, id)
-                .like(StringUtils.isNotBlank(title), SiteArticle::getTitle, title)
-                .orderByDesc(SiteArticle::getIstop).orderByAsc(SiteArticle::getSortindex, SiteArticle::getId);
+                .like(StringUtils.isNotBlank(title), SiteArticle::getTitle, title);
+        if(StringUtils.isNotBlank(order) && order.equals("sortindex")){
+            queryWrapper.orderByDesc(SiteArticle::getIstop).orderByAsc(SiteArticle::getSortindex, SiteArticle::getId);
+        }else{
+            queryWrapper.orderByDesc(SiteArticle::getIstop,SiteArticle::getCreatedate);
+        }
+
         page = this.page(page, queryWrapper);
 
         for (int i = 0; i < page.getRecords().size(); i++) {