From 5b359ed6a3cc245c0c366cc9feab0cc969a30ace Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Thu, 13 Feb 2025 11:21:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor(resource):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=E5=92=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcwl/resource/service/impl/ModelCommentServiceImpl.java   | 3 ++-
 .../resource/service/impl/ModelImageCommentServiceImpl.java   | 4 +++-
 .../resource/service/impl/WorkFlowCommentLikeServiceImpl.java | 2 +-
 .../resource/service/impl/WorkFlowCommentServiceImpl.java     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java
index 5ea5071..93dacaf 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java
@@ -72,7 +72,7 @@ public class ModelCommentServiceImpl extends ServiceImpl<ModelCommentMapper, Mod
                 .isNull(ModelComment::getParentId);
         if (sortType == 0) {
             // 按点赞数降序，创建时间升序
-            lqw.orderByAsc(ModelComment::getLikeNum)
+            lqw.orderByDesc(ModelComment::getLikeNum)
                     .orderByAsc(ModelComment::getCreateTime);
         } else {
             lqw.orderByDesc(ModelComment::getCreateTime);
@@ -121,6 +121,7 @@ public class ModelCommentServiceImpl extends ServiceImpl<ModelCommentMapper, Mod
         // 获取所模型父评论
         List<ModelComment> modelCommentList = baseMapper.selectList(
                 new LambdaQueryWrapper<ModelComment>()
+                        .isNull(ModelComment::getParentId)
                         .eq(ModelComment::getModelId, modelId));
 
         // 获取所有父评论的ID
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentServiceImpl.java
index 47f3657..d35c194 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageCommentServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mcwl.common.core.domain.entity.SysUser;
 import com.mcwl.common.utils.SecurityUtils;
+import com.mcwl.resource.domain.ModelComment;
 import com.mcwl.resource.domain.ModelImageComment;
 import com.mcwl.resource.domain.ModelImageCommentLike;
 import com.mcwl.resource.domain.WorkFlowComment;
@@ -64,7 +65,7 @@ public class ModelImageCommentServiceImpl extends ServiceImpl<ModelImageCommentM
                 .isNull(ModelImageComment::getParentId);
         if (sortType == 0) {
             // 按点赞数降序，创建时间升序
-            lqw.orderByAsc(ModelImageComment::getLikeNum)
+            lqw.orderByDesc(ModelImageComment::getLikeNum)
                     .orderByAsc(ModelImageComment::getCreateTime);
         } else {
             lqw.orderByDesc(ModelImageComment::getCreateTime);
@@ -108,6 +109,7 @@ public class ModelImageCommentServiceImpl extends ServiceImpl<ModelImageCommentM
         // 获取所有图片父评论
         List<ModelImageComment> modelImageCommentList = baseMapper.selectList(
                 new LambdaQueryWrapper<ModelImageComment>()
+                        .isNull(ModelImageComment::getParentId)
                         .eq(ModelImageComment::getModelImageId, imageId));
 
         // 获取所有父评论的ID
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentLikeServiceImpl.java
index 1745405..f4cbe28 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentLikeServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentLikeServiceImpl.java
@@ -39,7 +39,7 @@ public class WorkFlowCommentLikeServiceImpl extends ServiceImpl<WorkFlowCommentL
         Long userId = SecurityUtils.getUserId();
         WorkFlowCommentLike workFlowCommentLike = baseMapper.getLikeComment(userId, commentId);
         if (Objects.nonNull(workFlowCommentLike)) {
-            if (Objects.equals(workFlowComment.getDelFlag(), "0")) {
+            if (Objects.equals(workFlowCommentLike.getDelFlag(), "0")) {
                 workFlowCommentLike.setDelFlag("2");
                 int likeNum = workFlowComment.getLikeNum() - 1;
                 likeNum = Math.max(likeNum, 0);
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentServiceImpl.java
index f80f631..28f18e8 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowCommentServiceImpl.java
@@ -69,7 +69,7 @@ public class WorkFlowCommentServiceImpl extends ServiceImpl<WorkFlowCommentMappe
                 .isNull(WorkFlowComment::getParentId);
         if (sortType == 0) {
             // 按点赞数降序，创建时间升序
-            lqw.orderByAsc(WorkFlowComment::getLikeNum)
+            lqw.orderByDesc(WorkFlowComment::getLikeNum)
                     .orderByAsc(WorkFlowComment::getCreateTime);
         } else {
             lqw.orderByDesc(WorkFlowComment::getCreateTime);
@@ -112,6 +112,7 @@ public class WorkFlowCommentServiceImpl extends ServiceImpl<WorkFlowCommentMappe
         // 获取所工作流父评论
         List<WorkFlowComment> modelCommentList = baseMapper.selectList(
                 new LambdaQueryWrapper<WorkFlowComment>()
+                        .isNull(WorkFlowComment::getParentId)
                         .eq(WorkFlowComment::getWorkFlowId, workFlowId));
 
         // 获取所有父评论的ID