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/ClientMeditationController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationController.java
index d3092f9..39d68ea 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationController.java
@@ -123,16 +123,17 @@
Long userId = loginUser.getUserid();
Meditation byId = meditationService.getById(meditationId);
List<Meditation> list = meditationService.lambdaQuery().eq(Meditation::getCateId, byId.getCateId())
+ .eq(Meditation::getListingStatus,1)
+ .ne(Meditation::getId,meditationId)
.list();
List<Meditation> courses = new ArrayList<>();
- // 如果list集合数据大于2 随机获取两个返回
+ // 如果list集合数据大于4 随机获取两个返回
if (CollUtils.isNotEmpty(list) && list.size() > 4) {
int size = list.size();
- int index = (int) (Math.random() * size);
for (int i = 0; i < 4; i++) {
- courses.add(list.get(index));
+ courses.add(list.get(i));
}
return R.ok(courses);
}else {
@@ -338,7 +339,6 @@
courseLambdaQueryWrapper.eq(dto.getChargeType()!=null,Meditation::getChargeType, dto.getChargeType());
courseLambdaQueryWrapper.eq(dto.getCateId()!=null,Meditation::getCateId, dto.getCateId());
courseLambdaQueryWrapper.like(dto.getMeditationTitle()!=null&& !dto.getMeditationTitle().isEmpty(),Meditation::getMeditationTitle, dto.getMeditationTitle());
- courseLambdaQueryWrapper.orderByDesc(Meditation::getSortNum);
courseLambdaQueryWrapper.orderByDesc(Meditation::getCreateTime);
Page<Meditation> page = meditationService.page(new Page<>(dto.getPageCurr(), dto.getPageSize()), courseLambdaQueryWrapper);
if (CollUtils.isEmpty(page.getRecords())) {
@@ -570,6 +570,8 @@
// 将以前的删掉
meditationEverydayService.remove(new LambdaQueryWrapper<MeditationEveryday>()
.eq(MeditationEveryday::getId,homeBackgroundMusic.getEverydayId()));
+ meditationTagService.remove(new LambdaQueryWrapper<>(MeditationTag.class)
+ .eq(MeditationTag::getMeditationId,homeBackgroundMusic.getId()));
}else if (homeBackgroundMusic.getIsEveryday() == 1){
meditationEverydayService.remove(new LambdaQueryWrapper<MeditationEveryday>()
.eq(MeditationEveryday::getId,homeBackgroundMusic.getEverydayId()));
--
Gitblit v1.7.1