From d9fb3586fe4ddeeb47d0b0654ee86cd62f6215e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E5=B0=8F=E5=A2=A8?=
 <2291200076@qq.com>
Date: Thu, 28 Apr 2022 22:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=A6=E7=B1=8D=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E9=93=BE=E6=8E=A5=E5=85=A8=E8=BF=94=E5=9B=9E=E8=AF=BB?=
 =?UTF-8?q?=E4=B8=80=E6=9C=AC=E4=B9=A6=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookshelfplus-frontend/views/book.html                        | 4 +++-
 .../plus/bookshelf/Controller/Controller/FileController.java  | 2 +-
 .../src/main/resources/mapping/FileObjectDOMapper.xml         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookshelfplus-frontend/views/book.html b/bookshelfplus-frontend/views/book.html
index 0ecb318..17a1b75 100644
--- a/bookshelfplus-frontend/views/book.html
+++ b/bookshelfplus-frontend/views/book.html
@@ -485,8 +485,10 @@
                         var fileObjectList = {};
                         for (let i = 0; i < data.fileObject.length; i++) {
                             const element = data.fileObject[i];
+
                             if (!fileObjectList[element.fileId])
                                 fileObjectList[element.fileId] = [];
+
                             fileObjectList[element.fileId].push(getLinkDOM(element));
 
                             // 从文件中找到fileSha1, fileName, fileExt，并填入文件对象中，否则下载时获取不到
@@ -503,7 +505,7 @@
 
                             direckLinkInfo[element.id] = element;
                         }
-                        console.log(fileObjectList);
+                        console.log("fileObjectList", fileObjectList);
 
                         // 再处理文件
                         var fileContainer = document.getElementById("file-container");
diff --git a/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java b/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java
index 5ec364c..71cf6eb 100644
--- a/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java
+++ b/bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java
@@ -54,7 +54,7 @@ public class FileController extends BaseController {
     @ApiOperation(value = "书籍下载页面获取文件提供的下载方式", notes = "")
     @RequestMapping(value = "getFileByBookId", method = {RequestMethod.GET})
     @ResponseBody
-    public CommonReturnType getFileByBookId(@RequestParam(value = "bookId", required = false) Integer bookId) throws BusinessException, InvocationTargetException, IllegalAccessException {
+    public CommonReturnType getFileByBookId(@RequestParam(value = "bookId", required = true) Integer bookId) throws BusinessException, InvocationTargetException, IllegalAccessException {
 
         List<FileModel> fileModels = fileService.getFileByBookId(bookId);
         List<FileVO> fileVOS = new ArrayList<>();
diff --git a/bookshelfplus/src/main/resources/mapping/FileObjectDOMapper.xml b/bookshelfplus/src/main/resources/mapping/FileObjectDOMapper.xml
index fb2708b..9afbe08 100644
--- a/bookshelfplus/src/main/resources/mapping/FileObjectDOMapper.xml
+++ b/bookshelfplus/src/main/resources/mapping/FileObjectDOMapper.xml
@@ -161,7 +161,7 @@
     SELECT
     <include refid="Base_Column_List" />
     FROM `file_object_info`
-    WHERE file_id IN (SELECT id AS file_id FROM `file_info` WHERE book_id = 1)
+    WHERE file_id IN (SELECT id AS file_id FROM `file_info` WHERE book_id = #{bookId})
       AND upload_status = 'SUCCESS'
   </select>
   <select id="selectByFileId" parameterType="java.lang.Integer" resultMap="BaseResultMap">