无关风月
2025-02-28 dd663d0ac783755d889e270eee57ee58630c88c8
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();