CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 排序

master
yang 2025-01-22 16:17:46 +08:00
parent c6a92b1e62
commit 09dfd88a12
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/QuestionCommentMapper.java
View File

@ -22,4 +22,8 @@ public interface QuestionCommentMapper extends BaseMapper<QuestionComment> {
Long communityId, Long communityId,
@Param("questionId") @Param("questionId")
Long questionId); Long questionId);
@InterceptorIgnore(tenantLine = "true")
QuestionComment selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(Long commentId, Long tenantId, Long communityId, Long questionId);
} }

7
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java
View File

@ -92,8 +92,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
Long questionId = questionCommentAdoptRes.getQuestionId(); Long questionId = questionCommentAdoptRes.getQuestionId();
Long commentId = questionCommentAdoptRes.getCommentId(); Long commentId = questionCommentAdoptRes.getCommentId();
// QuestionComment questionComment = baseMapper.selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(commentId, tenantId, communityId, questionId); QuestionComment questionComment = baseMapper.selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(commentId, tenantId, communityId, questionId);
QuestionComment questionComment = null;
if (Objects.isNull(questionComment)) { if (Objects.isNull(questionComment)) {
return AjaxResult.error("评论不存在"); return AjaxResult.error("评论不存在");
} }
@ -116,9 +115,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
if (StringUtils.isBlank(questionCommentPageRes.getOrderByColumn())) { if (StringUtils.isBlank(questionCommentPageRes.getOrderByColumn())) {
questionCommentPageRes.setOrderByColumn("create_time"); questionCommentPageRes.setOrderByColumn("create_time");
} }
OrderItem orderItem = OrderItem.desc(questionCommentPageRes.getOrderByColumn());
boolean isAsc = Objects.equals(questionCommentPageRes.getIsAsc(), "asc");
OrderItem orderItem = new OrderItem(questionCommentPageRes.getOrderByColumn(), isAsc);
page.addOrder(orderItem); page.addOrder(orderItem);

9
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
View File

@ -136,15 +136,16 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
imagePageRes.setOrderByColumn("create_time"); imagePageRes.setOrderByColumn("create_time");
} }
// 设置排序 // 设置排序
OrderItem orderItem = OrderItem.desc(imagePageRes.getOrderByColumn()); List<OrderItem> orderItemList = new ArrayList<>();
page.addOrder(orderItem); orderItemList.add(OrderItem.desc("is_top"));
orderItemList.add(OrderItem.desc(imagePageRes.getOrderByColumn()));
page.addOrder(orderItemList);
LambdaQueryWrapper<ModelProduct> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ModelProduct> 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( ModelProduct::getUserId, SecurityUtils.getUserId()) .eq( ModelProduct::getUserId, SecurityUtils.getUserId())
.ge(imagePageRes.getStartTime() != null, ModelProduct::getCreateTime, imagePageRes.getStartTime()) .ge(imagePageRes.getStartTime() != null, ModelProduct::getCreateTime, imagePageRes.getStartTime())
.le(imagePageRes.getEndTime() != null, ModelProduct::getCreateTime, imagePageRes.getEndTime()); .le(imagePageRes.getEndTime() != null, ModelProduct::getCreateTime, imagePageRes.getEndTime());
postMapper.selectPage(page, lqw); postMapper.selectPage(page, lqw);
// 获取分页数据 // 获取分页数据
List<ModelProduct> modelImageList = page.getRecords(); List<ModelProduct> modelImageList = page.getRecords();