|
|
@@ -84,7 +84,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if (StringUtils.isNotBlank(dto.getTitle())) {
|
|
|
queryWrapper.like(Project::getTitle, dto.getTitle());
|
|
|
}
|
|
|
- // 状态
|
|
|
+ // 上下架状态
|
|
|
if (ObjectUtil.isNotEmpty(dto.getStatus())) {
|
|
|
queryWrapper.eq(Project::getStatus, dto.getStatus());
|
|
|
}
|
|
|
@@ -92,7 +92,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if (ObjectUtil.isNotEmpty(dto.getCategoryId())) {
|
|
|
queryWrapper.eq(Project::getCategoryId, dto.getCategoryId());
|
|
|
}
|
|
|
- queryWrapper.orderByDesc(Project::getCreateTime).orderByDesc(Project::getSortOrder);
|
|
|
+ queryWrapper.orderByDesc(Project::getCreateTime).orderByAsc(Project::getSortOrder);
|
|
|
Page<ProjectPageVo> pageData = new Page<>();
|
|
|
pageData.setCurrent(page.getCurrent());
|
|
|
pageData.setSize(page.getSize());
|