diff --git a/src/main/java/com/qiwenshare/file/api/IShareService.java b/src/main/java/com/qiwenshare/file/api/IShareService.java index cf55127..30ad3e6 100644 --- a/src/main/java/com/qiwenshare/file/api/IShareService.java +++ b/src/main/java/com/qiwenshare/file/api/IShareService.java @@ -10,5 +10,5 @@ import java.util.List; public interface IShareService extends IService { List selectShareList(ShareListDTO shareListDTO, String userId, Integer type); - int selectShareListTotalCount(ShareListDTO shareListDTO, String userId); + int selectShareListTotalCount(ShareListDTO shareListDTO, String userId, Integer type); } diff --git a/src/main/java/com/qiwenshare/file/controller/ShareController.java b/src/main/java/com/qiwenshare/file/controller/ShareController.java index 242dde9..39a0ab3 100644 --- a/src/main/java/com/qiwenshare/file/controller/ShareController.java +++ b/src/main/java/com/qiwenshare/file/controller/ShareController.java @@ -173,7 +173,7 @@ public class ShareController { shareListDTO.setSharedFlag(0); List shareList = shareService.selectShareList(shareListDTO, sessionUserBean.getUserId(), 1); - int total = shareService.selectShareListTotalCount(shareListDTO, sessionUserBean.getUserId()); + int total = shareService.selectShareListTotalCount(shareListDTO, sessionUserBean.getUserId(), 1); return RestResult.success().dataList(shareList, total); } @@ -186,7 +186,7 @@ public class ShareController { // JwtUser sessionUserBean = SessionUtil.getSession(); shareListDTO.setSharedFlag(1); List shareList = shareService.selectShareList(shareListDTO, null, 2); - int total = shareService.selectShareListTotalCount(shareListDTO, null); + int total = shareService.selectShareListTotalCount(shareListDTO, null, 2); 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 c370e33..b90e094 100644 --- a/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java +++ b/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java @@ -10,5 +10,5 @@ public interface ShareMapper extends BaseMapper { List selectShareList(String shareFilePath, Integer sharedFlag, String shareBatchNum, Long beginCount, Long pageCount, String userId, Integer type); - int selectShareListTotalCount(String shareFilePath, String shareBatchNum, String userId); + int selectShareListTotalCount(String shareFilePath, String shareBatchNum, String userId, Integer type); } diff --git a/src/main/java/com/qiwenshare/file/service/ShareService.java b/src/main/java/com/qiwenshare/file/service/ShareService.java index 8af785a..14efe5b 100644 --- a/src/main/java/com/qiwenshare/file/service/ShareService.java +++ b/src/main/java/com/qiwenshare/file/service/ShareService.java @@ -31,7 +31,7 @@ public class ShareService extends ServiceImpl implements ISh } @Override - public int selectShareListTotalCount(ShareListDTO shareListDTO, String userId) { - return shareMapper.selectShareListTotalCount(shareListDTO.getShareFilePath(), shareListDTO.getShareBatchNum(), userId); + public int selectShareListTotalCount(ShareListDTO shareListDTO, String userId, Integer type) { + return shareMapper.selectShareListTotalCount(shareListDTO.getShareFilePath(), shareListDTO.getShareBatchNum(), userId, type); } }