From 818db8c3c99f4eae1b32ec954f80271a4b841873 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 19 Sep 2024 14:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2=20-=20=E5=85=B1=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qiwenshare/file/controller/ShareController.java   | 8 +++-----
 src/main/resources/mapper/ShareMapper.xml                 | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/controller/ShareController.java b/src/main/java/com/qiwenshare/file/controller/ShareController.java
index d765bf7..dd91219 100644
--- a/src/main/java/com/qiwenshare/file/controller/ShareController.java
+++ b/src/main/java/com/qiwenshare/file/controller/ShareController.java
@@ -183,12 +183,10 @@ public class ShareController {
     @GetMapping(value = "/getShareList")
     @ResponseBody
     public RestResult<ShareListVO> getShareList(ShareListDTO shareListDTO) {
-        JwtUser sessionUserBean = SessionUtil.getSession();
+//        JwtUser sessionUserBean = SessionUtil.getSession();
         shareListDTO.setSharedFlag(1);
-        List<ShareListVO> shareList = shareService.selectShareList(shareListDTO, sessionUserBean.getUserId());
-
-        int total = shareService.selectShareListTotalCount(shareListDTO, sessionUserBean.getUserId());
-
+        List<ShareListVO> shareList = shareService.selectShareList(shareListDTO, null);
+        int total = shareService.selectShareListTotalCount(shareListDTO, null);
         return RestResult.success().dataList(shareList, total);
     }
 
diff --git a/src/main/resources/mapper/ShareMapper.xml b/src/main/resources/mapper/ShareMapper.xml
index 1f5f71a..6eead93 100644
--- a/src/main/resources/mapper/ShareMapper.xml
+++ b/src/main/resources/mapper/ShareMapper.xml
@@ -7,10 +7,11 @@
 <mapper namespace="com.qiwenshare.file.mapper.ShareMapper">
 
     <select id="selectShareList" resultType="com.qiwenshare.file.vo.share.ShareListVO">
-        SELECT * FROM share a
+        SELECT *,e.username as creator FROM share a
         LEFT JOIN sharefile b ON b.shareBatchNum = a.shareBatchNum
         LEFT JOIN userfile c ON c.userFileId = b.userFileId
         LEFT JOIN file d ON d.fileId = c.fileId
+        left join user as e on c.userId = e.userId
         WHERE shareFilePath = #{shareFilePath}
         <if test="shareBatchNum != null">
             AND a.shareBatchNum = #{shareBatchNum}
@@ -33,4 +34,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>