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/ClientHomeController.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
index 620bd94..94884a7 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
@@ -167,18 +167,38 @@
     public R<ClientHomeBackgroundMusicVO> getHomeBackgroundMusicByUserId() {
         if (tokenService.getLoginUser()==null){
             // 游客登录模式 不要返回登录失效 返回空即可
-            return R.ok(new ClientHomeBackgroundMusicVO());
+            List<HomeBackgroundMusic> list = homeBackgroundMusicService.list();
+            if (list.isEmpty()){
+                return R.ok(new ClientHomeBackgroundMusicVO());
+            }
+            ClientHomeBackgroundMusicVO clientHomeBackgroundMusicVO = new ClientHomeBackgroundMusicVO();
+            BeanUtils.copyProperties(list.get(0), clientHomeBackgroundMusicVO);
+            return R.ok(clientHomeBackgroundMusicVO);
         }
         HomeBackgroundMusicUser homeBackgroundMusicUser = homeBackgroundMusicUserService.lambdaQuery()
                 .eq(HomeBackgroundMusicUser::getAppUserId, tokenService.getLoginUser().getAppUserId())
                 .one();
         if (homeBackgroundMusicUser==null){
-            return R.ok(new ClientHomeBackgroundMusicVO());
+            List<HomeBackgroundMusic> list = homeBackgroundMusicService.list();
+            if (list.isEmpty()){
+                return R.ok(new ClientHomeBackgroundMusicVO());
+            }
+            ClientHomeBackgroundMusicVO clientHomeBackgroundMusicVO = new ClientHomeBackgroundMusicVO();
+            BeanUtils.copyProperties(list.get(0), clientHomeBackgroundMusicVO);
+            return R.ok(clientHomeBackgroundMusicVO);
         }
         HomeBackgroundMusic homeBackgroundMusic = homeBackgroundMusicService.lambdaQuery()
                 .eq(HomeBackgroundMusic::getId, homeBackgroundMusicUser.getHomeBackgroundMusicId())
                 .one();
-        if (homeBackgroundMusic==null)return R.ok(new ClientHomeBackgroundMusicVO());
+        if (homeBackgroundMusic==null){
+            List<HomeBackgroundMusic> list = homeBackgroundMusicService.list();
+            if (list.isEmpty()){
+                return R.ok(new ClientHomeBackgroundMusicVO());
+            }
+            ClientHomeBackgroundMusicVO clientHomeBackgroundMusicVO = new ClientHomeBackgroundMusicVO();
+            BeanUtils.copyProperties(list.get(0), clientHomeBackgroundMusicVO);
+            return R.ok(clientHomeBackgroundMusicVO);
+        }
         ClientHomeBackgroundMusicVO clientHomeBackgroundMusicVO = new ClientHomeBackgroundMusicVO();
         BeanUtils.copyProperties(homeBackgroundMusic, clientHomeBackgroundMusicVO);
         return R.ok(clientHomeBackgroundMusicVO);

--
Gitblit v1.7.1