From 1addde3ac7395ceab66d4330c69693773ec93f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com>
Date: Fri, 18 Jun 2021 13:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 .../file/controller/FiletransferController.java          | 9 ++++++---
 .../java/com/qiwenshare/file/dto/file/PreviewDTO.java    | 2 --
 .../com/qiwenshare/file/vo/share/ShareFileListVO.java    | 4 ++--
 src/main/resources/mybatis/mapper/ShareFileMapper.xml    | 1 +
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4219d30..d24d6fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.qiwenshare</groupId>
     <artifactId>qiwen-file</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
     <name>qiwen-file</name>
     <description>fileos.qiwenshare.com</description>
     <packaging>jar</packaging>
diff --git a/src/main/java/com/qiwenshare/file/controller/FiletransferController.java b/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
index ebfeeb6..33112c3 100644
--- a/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
+++ b/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
@@ -160,8 +160,10 @@ public class FiletransferController {
     @GetMapping("/preview")
     public void preview(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,  PreviewDTO previewDTO){
         UserFile userFile = userFileService.getById(previewDTO.getUserFileId());
-        String token = previewDTO.getToken();
-        if ("1".equals(previewDTO.getMode())) {
+
+        if ("undefined".equals(previewDTO.getShareBatchNum())  || StringUtils.isEmpty(previewDTO.getShareBatchNum())) {
+
+            String token = previewDTO.getToken();
             UserBean sessionUserBean = userService.getUserBeanByToken(token);
             if (sessionUserBean == null) {
                 return;
@@ -169,7 +171,8 @@ public class FiletransferController {
             if (userFile.getUserId() != sessionUserBean.getUserId()) {
                 return;
             }
-        } else if ("2".equals(previewDTO.getMode())) {
+        } else {
+
             Map<String, Object> param = new HashMap<>();
             param.put("shareBatchNum", previewDTO.getShareBatchNum());
             List<Share> shareList = shareService.listByMap(param);
diff --git a/src/main/java/com/qiwenshare/file/dto/file/PreviewDTO.java b/src/main/java/com/qiwenshare/file/dto/file/PreviewDTO.java
index e659482..cb37f21 100644
--- a/src/main/java/com/qiwenshare/file/dto/file/PreviewDTO.java
+++ b/src/main/java/com/qiwenshare/file/dto/file/PreviewDTO.java
@@ -8,8 +8,6 @@ import lombok.Data;
 public class PreviewDTO {
     private Long userFileId;
     private String token;
-    @Schema(description="预览模式，1-登录，2-分享")
-    private String mode;
     @Schema(description="批次号")
     private String shareBatchNum;
     @Schema(description="提取码")
diff --git a/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java b/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java
index 32faffc..74a7eda 100644
--- a/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java
+++ b/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java
@@ -41,8 +41,8 @@ public class ShareFileListVO {
 //
 //    private String shareTime;
 //    private String endTime;
-//    private String extractionCode;
-//    private String shareBatchNum;
+    private String extractionCode;
+    private String shareBatchNum;
 //    private Integer shareType;//0公共，1私密，2好友
 //    private Integer shareStatus;//0正常，1已失效，2已撤销
 }
diff --git a/src/main/resources/mybatis/mapper/ShareFileMapper.xml b/src/main/resources/mybatis/mapper/ShareFileMapper.xml
index a0448ef..8336bd8 100644
--- a/src/main/resources/mybatis/mapper/ShareFileMapper.xml
+++ b/src/main/resources/mybatis/mapper/ShareFileMapper.xml
@@ -17,6 +17,7 @@
 
     <select id="selectShareFileList" resultType="com.qiwenshare.file.vo.share.ShareFileListVO">
         select * from sharefile a
+        LEFT JOIN share ON share.shareBatchNum = a.shareBatchNum
         left join userfile b on b.userFileId = a.userFileId
         left join file c on c.fileId = b.fileId
         where a.shareBatchNum = #{shareBatchNum}