Merge remote-tracking branch 'origin/master'

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnArticleServiceImpl.java

@@ -75,6 +75,7 @@ public class ColumnArticleServiceImpl extends ServiceImpl<ColumnArticleMapper, C
             wrapper.like("ca", ColumnArticle::getTitle, dto.getTitle());
         }
         wrapper.orderByAsc("ca", ColumnArticle::getSort);
+        wrapper.orderByDesc("ca", ColumnArticle::getTime);
         List<ColumnArticleVo> list = this.baseMapper.getList(wrapper);
         return list;
     }
@@ -93,6 +94,7 @@ public class ColumnArticleServiceImpl extends ServiceImpl<ColumnArticleMapper, C
             wrapper.eq("ca", ColumnArticle::getSubId, dto.getSubId());
         }
         wrapper.orderByAsc("ca", ColumnArticle::getSort);
+        wrapper.orderByDesc("ca", ColumnArticle::getTime);
         Page<ColumnArticleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         Map<Long, String> map = columnMenuService.getList(new ColumnMenuSelectDto()).stream().collect(Collectors.toMap(ColumnMenuVo::getId, ColumnMenuVo::getName));
@@ -175,6 +177,7 @@ public class ColumnArticleServiceImpl extends ServiceImpl<ColumnArticleMapper, C
             wrapper.eq("ca", ColumnArticle::getSubId, dto.getSubId());
         }
         wrapper.orderByAsc("ca", ColumnArticle::getSort);
+        wrapper.orderByDesc("ca", ColumnArticle::getTime);
         Page<ColumnArticleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         page.getRecords().forEach(x->{