diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index d3d1b37..784692e 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -134,17 +134,17 @@ public class ModelServiceImpl extends ServiceImpl impl if (StringUtils.isEmpty(imagePageRes.getOrderByColumn())) { imagePageRes.setOrderByColumn("create_time"); } - // 设置排序 +// 设置排序 boolean isAsc = Objects.equals(imagePageRes.getIsAsc(), "asc"); OrderItem orderItem = new OrderItem(imagePageRes.getOrderByColumn(), isAsc); + page.addOrder(new OrderItem("is_top",false)); page.addOrder(orderItem); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(imagePageRes.getStatus() != null, ModelProduct::getAuditStatus, imagePageRes.getStatus()) + lqw.eq(imagePageRes.getStatus() != null && imagePageRes.getStatus() != 0, ModelProduct::getAuditStatus, imagePageRes.getStatus()) .eq(imagePageRes.getUserId() != null, ModelProduct::getUserId, imagePageRes.getUserId()) .ge(imagePageRes.getStartTime() != null, ModelProduct::getCreateTime, imagePageRes.getStartTime()) .le(imagePageRes.getEndTime() != null, ModelProduct::getCreateTime, imagePageRes.getEndTime()); - postMapper.selectPage(page, lqw); // 获取分页数据 List modelImageList = page.getRecords();