文件管理名称查询 - 共享文件bug
This commit is contained in:
parent
ea8aa1851a
commit
d89551c328
@ -10,5 +10,5 @@ import java.util.List;
|
|||||||
public interface IShareService extends IService<Share> {
|
public interface IShareService extends IService<Share> {
|
||||||
List<ShareListVO> selectShareList(ShareListDTO shareListDTO, String userId, Integer type);
|
List<ShareListVO> selectShareList(ShareListDTO shareListDTO, String userId, Integer type);
|
||||||
|
|
||||||
int selectShareListTotalCount(ShareListDTO shareListDTO, String userId);
|
int selectShareListTotalCount(ShareListDTO shareListDTO, String userId, Integer type);
|
||||||
}
|
}
|
||||||
|
@ -173,7 +173,7 @@ public class ShareController {
|
|||||||
shareListDTO.setSharedFlag(0);
|
shareListDTO.setSharedFlag(0);
|
||||||
List<ShareListVO> shareList = shareService.selectShareList(shareListDTO, sessionUserBean.getUserId(), 1);
|
List<ShareListVO> 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);
|
return RestResult.success().dataList(shareList, total);
|
||||||
}
|
}
|
||||||
@ -186,7 +186,7 @@ public class ShareController {
|
|||||||
// JwtUser sessionUserBean = SessionUtil.getSession();
|
// JwtUser sessionUserBean = SessionUtil.getSession();
|
||||||
shareListDTO.setSharedFlag(1);
|
shareListDTO.setSharedFlag(1);
|
||||||
List<ShareListVO> shareList = shareService.selectShareList(shareListDTO, null, 2);
|
List<ShareListVO> 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);
|
return RestResult.success().dataList(shareList, total);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,5 +10,5 @@ public interface ShareMapper extends BaseMapper<Share> {
|
|||||||
|
|
||||||
List<ShareListVO> selectShareList(String shareFilePath, Integer sharedFlag, String shareBatchNum, Long beginCount, Long pageCount, String userId, Integer type);
|
List<ShareListVO> 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);
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ public class ShareService extends ServiceImpl<ShareMapper, Share> implements ISh
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int selectShareListTotalCount(ShareListDTO shareListDTO, String userId) {
|
public int selectShareListTotalCount(ShareListDTO shareListDTO, String userId, Integer type) {
|
||||||
return shareMapper.selectShareListTotalCount(shareListDTO.getShareFilePath(), shareListDTO.getShareBatchNum(), userId);
|
return shareMapper.selectShareListTotalCount(shareListDTO.getShareFilePath(), shareListDTO.getShareBatchNum(), userId, type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user