From ea8aa1851a908f1ccf82200e2cf8bd2e4165ba91 Mon Sep 17 00:00:00 2001 From: aikai Date: Thu, 19 Sep 2024 17:11:17 +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 --- src/main/java/com/qiwenshare/file/api/IShareService.java | 9 +++------ .../com/qiwenshare/file/controller/ShareController.java | 4 ++-- .../java/com/qiwenshare/file/mapper/ShareMapper.java | 2 +- .../java/com/qiwenshare/file/service/ShareService.java | 7 ++++--- src/main/resources/mapper/ShareMapper.xml | 8 +++++++- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/api/IShareService.java b/src/main/java/com/qiwenshare/file/api/IShareService.java index 86fdd20..cf55127 100644 --- a/src/main/java/com/qiwenshare/file/api/IShareService.java +++ b/src/main/java/com/qiwenshare/file/api/IShareService.java @@ -1,17 +1,14 @@ package com.qiwenshare.file.api; import com.baomidou.mybatisplus.extension.service.IService; -import com.qiwenshare.file.domain.RecoveryFile; import com.qiwenshare.file.domain.Share; -import com.qiwenshare.file.domain.ShareFile; import com.qiwenshare.file.dto.sharefile.ShareListDTO; -import com.qiwenshare.file.vo.share.ShareFileListVO; import com.qiwenshare.file.vo.share.ShareListVO; -import org.apache.ibatis.annotations.Param; import java.util.List; -public interface IShareService extends IService { - List selectShareList(ShareListDTO shareListDTO, String userId); +public interface IShareService extends IService { + List selectShareList(ShareListDTO shareListDTO, String userId, Integer type); + int selectShareListTotalCount(ShareListDTO shareListDTO, String userId); } diff --git a/src/main/java/com/qiwenshare/file/controller/ShareController.java b/src/main/java/com/qiwenshare/file/controller/ShareController.java index dd91219..242dde9 100644 --- a/src/main/java/com/qiwenshare/file/controller/ShareController.java +++ b/src/main/java/com/qiwenshare/file/controller/ShareController.java @@ -171,7 +171,7 @@ public class ShareController { public RestResult shareList(ShareListDTO shareListDTO) { JwtUser sessionUserBean = SessionUtil.getSession(); shareListDTO.setSharedFlag(0); - List shareList = shareService.selectShareList(shareListDTO, sessionUserBean.getUserId()); + List shareList = shareService.selectShareList(shareListDTO, sessionUserBean.getUserId(), 1); int total = shareService.selectShareListTotalCount(shareListDTO, sessionUserBean.getUserId()); @@ -185,7 +185,7 @@ public class ShareController { public RestResult getShareList(ShareListDTO shareListDTO) { // JwtUser sessionUserBean = SessionUtil.getSession(); shareListDTO.setSharedFlag(1); - List shareList = shareService.selectShareList(shareListDTO, null); + List shareList = shareService.selectShareList(shareListDTO, null, 2); int total = shareService.selectShareListTotalCount(shareListDTO, null); return RestResult.success().dataList(shareList, total); } diff --git a/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java b/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java index e5e3bb7..c370e33 100644 --- a/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java +++ b/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface ShareMapper extends BaseMapper { - List selectShareList(String shareFilePath, Integer sharedFlag, String shareBatchNum, Long beginCount, Long pageCount, String userId); + List selectShareList(String shareFilePath, Integer sharedFlag, String shareBatchNum, Long beginCount, Long pageCount, String userId, Integer type); int selectShareListTotalCount(String shareFilePath, String shareBatchNum, String userId); } diff --git a/src/main/java/com/qiwenshare/file/service/ShareService.java b/src/main/java/com/qiwenshare/file/service/ShareService.java index 540bddb..8af785a 100644 --- a/src/main/java/com/qiwenshare/file/service/ShareService.java +++ b/src/main/java/com/qiwenshare/file/service/ShareService.java @@ -12,21 +12,22 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; + @Slf4j @Service -@Transactional(rollbackFor=Exception.class) +@Transactional(rollbackFor = Exception.class) public class ShareService extends ServiceImpl implements IShareService { @Resource ShareMapper shareMapper; @Override - public List selectShareList(ShareListDTO shareListDTO, String userId) { + public List selectShareList(ShareListDTO shareListDTO, String userId, Integer type) { Long beginCount = (shareListDTO.getCurrentPage() - 1) * shareListDTO.getPageCount(); return shareMapper.selectShareList(shareListDTO.getShareFilePath(), shareListDTO.getSharedFlag(), shareListDTO.getShareBatchNum(), - beginCount, shareListDTO.getPageCount(), userId); + beginCount, shareListDTO.getPageCount(), userId, type); } @Override diff --git a/src/main/resources/mapper/ShareMapper.xml b/src/main/resources/mapper/ShareMapper.xml index 9d7ea50..b205c87 100644 --- a/src/main/resources/mapper/ShareMapper.xml +++ b/src/main/resources/mapper/ShareMapper.xml @@ -13,13 +13,19 @@ LEFT JOIN file d ON d.fileId = c.fileId left join user as e on c.userId = e.userId WHERE shareFilePath = #{shareFilePath} - and a.shareType = 3 + and c.userFileId is not null AND a.shareBatchNum = #{shareBatchNum} AND c.userId = #{userId} + + and a.shareType != 3 + + + and a.shareType = 3 + order BY shareTime desc limit #{beginCount}, #{pageCount}