From b1d795337c4ce024b2823f3c160f41e7bee67623 Mon Sep 17 00:00:00 2001
From: ikmkj <1@qq,com>
Date: Sat, 26 Jul 2025 22:56:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(layout):=20=E4=BC=98=E5=8C=96=20AdminL?=
 =?UTF-8?q?ayout=20=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=92=8C=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 el-main 组件中添加 scroll-wrapper 类，实现内容区域的滚动功能
- 调整 admin-main 和 scroll-wrapper 的样式，确保滚动效果正常
- 修改 CommentDTO、PlaylistDTO 和 PlaylistServiceImpl 中的歌单类型相关字段和方法
---
 .../java/com/test/musichouduan/dto/CommentDTO.java |  5 +++++
 .../com/test/musichouduan/dto/PlaylistDTO.java     |  9 +++++++--
 .../service/impl/PlaylistServiceImpl.java          | 14 ++++++++++----
 music-qianduan/src/layouts/AdminLayout.vue         |  9 +++++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/music-houduan/src/main/java/com/test/musichouduan/dto/CommentDTO.java b/music-houduan/src/main/java/com/test/musichouduan/dto/CommentDTO.java
index eab46d4..8e6043d 100644
--- a/music-houduan/src/main/java/com/test/musichouduan/dto/CommentDTO.java
+++ b/music-houduan/src/main/java/com/test/musichouduan/dto/CommentDTO.java
@@ -46,6 +46,11 @@ public class CommentDTO {
      */
     private List<CommentDTO> children;
 
+    /**
+     * 状态：0-禁用，1-正常
+     */
+    private Integer status;
+
     /**
      * 创建时间
      */
diff --git a/music-houduan/src/main/java/com/test/musichouduan/dto/PlaylistDTO.java b/music-houduan/src/main/java/com/test/musichouduan/dto/PlaylistDTO.java
index c249156..e869027 100644
--- a/music-houduan/src/main/java/com/test/musichouduan/dto/PlaylistDTO.java
+++ b/music-houduan/src/main/java/com/test/musichouduan/dto/PlaylistDTO.java
@@ -38,9 +38,14 @@ public class PlaylistDTO {
     private UserDTO creator;
 
     /**
-     * 歌单类型
+     * 歌单类型ID
      */
-    private PlaylistTypeDTO type;
+    private Long typeId;
+
+    /**
+     * 歌单类型名称
+     */
+    private String typeName;
 
     /**
      * 是否官方歌单：0-否，1-是
diff --git a/music-houduan/src/main/java/com/test/musichouduan/service/impl/PlaylistServiceImpl.java b/music-houduan/src/main/java/com/test/musichouduan/service/impl/PlaylistServiceImpl.java
index 31b9364..5903750 100644
--- a/music-houduan/src/main/java/com/test/musichouduan/service/impl/PlaylistServiceImpl.java
+++ b/music-houduan/src/main/java/com/test/musichouduan/service/impl/PlaylistServiceImpl.java
@@ -251,8 +251,8 @@ public class PlaylistServiceImpl implements PlaylistService {
         playlist.setIsOfficial(0); // 默认为非官方歌单
 
         // 设置歌单类型
-        if (playlistDTO.getType() != null && playlistDTO.getType().getId() != null) {
-            PlaylistType type = playlistTypeRepository.findById(playlistDTO.getType().getId())
+        if (playlistDTO.getTypeId() != null) {
+            PlaylistType type = playlistTypeRepository.findById(playlistDTO.getTypeId())
                     .orElseThrow(() -> new BusinessException("歌单类型不存在"));
             playlist.setType(type);
         }
@@ -300,8 +300,8 @@ public class PlaylistServiceImpl implements PlaylistService {
         System.out.println("更新后的歌单isOfficial值: " + playlist.getIsOfficial());
 
         // 更新歌单类型
-        if (playlistDTO.getType() != null && playlistDTO.getType().getId() != null) {
-            PlaylistType type = playlistTypeRepository.findById(playlistDTO.getType().getId())
+        if (playlistDTO.getTypeId() != null) {
+            PlaylistType type = playlistTypeRepository.findById(playlistDTO.getTypeId())
                     .orElseThrow(() -> new BusinessException("歌单类型不存在"));
             playlist.setType(type);
         }
@@ -551,6 +551,12 @@ public class PlaylistServiceImpl implements PlaylistService {
             playlistDTO.setCreator(creatorDTO);
         }
 
+        // 设置类型信息
+        if (playlist.getType() != null) {
+            playlistDTO.setTypeId(playlist.getType().getId());
+            playlistDTO.setTypeName(playlist.getType().getName());
+        }
+
         // 设置音乐列表
         if (playlist.getMusics() != null && !playlist.getMusics().isEmpty()) {
             List<MusicDTO> musicDTOs = playlist.getMusics().stream()
diff --git a/music-qianduan/src/layouts/AdminLayout.vue b/music-qianduan/src/layouts/AdminLayout.vue
index b62fbae..814121f 100644
--- a/music-qianduan/src/layouts/AdminLayout.vue
+++ b/music-qianduan/src/layouts/AdminLayout.vue
@@ -183,7 +183,9 @@ const menuItems = [
 
         <!-- 内容区域 -->
         <el-main class="admin-main">
-          <router-view />
+          <div class="scroll-wrapper">
+            <router-view />
+          </div>
         </el-main>
 
         <!-- 页脚 -->
@@ -290,8 +292,11 @@ const menuItems = [
 .admin-main {
   background: linear-gradient(135deg, #f8bbd0 0%, #e1bee7 50%, #bbdefb 100%);
   padding: 20px;
+}
+
+.scroll-wrapper {
+  height: 100%;
   overflow-y: auto;
-  flex: 1;
 }
 
 /* 修改卡片样式 */