From dd663d0ac783755d889e270eee57ee58630c88c8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:46:52 +0800
Subject: [PATCH] 冥想2.0新增代码

---
 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java
index cdccfe4..75e231e 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java
@@ -219,7 +219,12 @@
             }
             meditationLambdaQueryWrapper.in(MeditationQuestion::getMeditationId,collect);
         }
-        meditationLambdaQueryWrapper.orderBy(true, true, MeditationQuestion::getReplyContent);  // "reply_content IS NULL" 确保 null 排前面
+        if (dto.getIsReplay()==null ){
+            meditationLambdaQueryWrapper.orderBy(true, true, MeditationQuestion::getReplyContent);  // "reply_content IS NULL" 确保 null 排前面
+        }
+        if (dto.getIsReplay()!=null && dto.getIsReplay()==2){
+            meditationLambdaQueryWrapper.orderBy(true, true, MeditationQuestion::getReplyContent);  // "reply_content IS NULL" 确保 null 排前面
+        }
 
         meditationLambdaQueryWrapper.orderByDesc(MeditationQuestion::getCreateTime);
         Page<MeditationQuestion> page = meditationQuestionService.page(new Page<>(dto.getPageCurr(), dto.getPageSize()), meditationLambdaQueryWrapper);

--
Gitblit v1.7.1