james 1 rok pred
rodič
commit
a717dc4434

+ 5 - 0
service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteArticle.java

@@ -83,6 +83,11 @@ public class SiteArticle implements Serializable {
      */
     private LocalDateTime modifydate;
 
+    /**
+     * 栏目排序
+     */
+    private Integer sortindex;
+
     /**
      * 栏目名称
      */

+ 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++) {

+ 1 - 0
service-website/service-website-biz/src/main/resources/mapper/website/SiteArticleMapper.xml

@@ -17,6 +17,7 @@
         <result column="zhaiyao" property="zhaiyao" />
         <result column="createdate" property="createdate" />
         <result column="modifydate" property="modifydate" />
+        <result column="sortindex" property="sortindex" />
     </resultMap>
 
 </mapper>