From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 cb0513b..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);
@@ -301,7 +306,7 @@
MeditationQuestion byId = meditationQuestionService.getById(id);
homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
- if (homeBackgroundMusic.getType() == 1){
+ if (homeBackgroundMusic.getType() == 2){
homeBackgroundMusic.setReplyTime(LocalDateTime.now());
// 给用户添加一条系统消息
NoticeRecord noticeRecord = new NoticeRecord();
--
Gitblit v1.7.1