From 09dfd88a12596f0d520068306cb7d157a2f3ef65 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Wed, 22 Jan 2025 16:17:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityCenter/mapper/QuestionCommentMapper.java    | 4 ++++
 .../service/impl/QuestionCommentServiceImpl.java         | 7 ++-----
 .../com/mcwl/resource/service/impl/ModelServiceImpl.java | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/QuestionCommentMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/QuestionCommentMapper.java
index a09803d..d149957 100644
--- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/QuestionCommentMapper.java
+++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/QuestionCommentMapper.java
@@ -22,4 +22,8 @@ public interface QuestionCommentMapper extends BaseMapper<QuestionComment> {
                                                                            Long communityId,
                                                                            @Param("questionId")
                                                                            Long questionId);
+
+
+    @InterceptorIgnore(tenantLine = "true")
+    QuestionComment selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(Long commentId, Long tenantId, Long communityId, Long questionId);
 }
diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java
index 0800345..6214d05 100644
--- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java
+++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java
@@ -92,8 +92,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
         Long questionId = questionCommentAdoptRes.getQuestionId();
         Long commentId = questionCommentAdoptRes.getCommentId();
 
-//        QuestionComment questionComment = baseMapper.selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(commentId, tenantId, communityId, questionId);
-        QuestionComment questionComment = null;
+        QuestionComment questionComment = baseMapper.selectByIdAndTenantIdAndCommunityIdAndQuestionIdAndCommentId(commentId, tenantId, communityId, questionId);
         if (Objects.isNull(questionComment)) {
             return AjaxResult.error("评论不存在");
         }
@@ -116,9 +115,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
         if (StringUtils.isBlank(questionCommentPageRes.getOrderByColumn())) {
             questionCommentPageRes.setOrderByColumn("create_time");
         }
-
-        boolean isAsc = Objects.equals(questionCommentPageRes.getIsAsc(), "asc");
-        OrderItem orderItem = new OrderItem(questionCommentPageRes.getOrderByColumn(), isAsc);
+        OrderItem orderItem = OrderItem.desc(questionCommentPageRes.getOrderByColumn());
         page.addOrder(orderItem);
 
 
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 1c50bd6..1799d32 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
@@ -136,15 +136,16 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
             imagePageRes.setOrderByColumn("create_time");
         }
         // 设置排序
-        OrderItem orderItem = OrderItem.desc(imagePageRes.getOrderByColumn());
-        page.addOrder(orderItem);
+        List<OrderItem> orderItemList = new ArrayList<>();
+        orderItemList.add(OrderItem.desc("is_top"));
+        orderItemList.add(OrderItem.desc(imagePageRes.getOrderByColumn()));
+        page.addOrder(orderItemList);
 
         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())
                 .ge(imagePageRes.getStartTime() != null, ModelProduct::getCreateTime, imagePageRes.getStartTime())
                 .le(imagePageRes.getEndTime() != null, ModelProduct::getCreateTime, imagePageRes.getEndTime());
-
         postMapper.selectPage(page, lqw);
         // 获取分页数据
         List<ModelProduct> modelImageList = page.getRecords();