This commit is contained in:
@@ -25,6 +25,7 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -148,11 +149,22 @@ public class FileEntityService {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
||||||
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
User user = userRepository.findById(userId).orElseThrow();
|
||||||
userId, FileStatus.ACTIVE);
|
List<FileEntity> allFiles = new ArrayList<>();
|
||||||
|
|
||||||
|
if (user.getCompany() != null) {
|
||||||
|
for (Long uId : userRepository.findByCompanyId(user.getCompany().getId()).stream()
|
||||||
|
.map(User::getId)
|
||||||
|
.toList()) {
|
||||||
|
allFiles.addAll(fileEntityRepository.findByUserIdAndStatus(uId, FileStatus.ACTIVE));
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
allFiles = fileEntityRepository.findByUserIdAndStatus(
|
||||||
|
userId, FileStatus.ACTIVE);
|
||||||
|
}
|
||||||
|
|
||||||
int start = (page - 1) * pageSize;
|
int start = (page - 1) * pageSize;
|
||||||
int end = Math.min(start + pageSize, allFiles.size());
|
int end = Math.min(start + pageSize, allFiles.size());
|
||||||
|
|||||||
Reference in New Issue
Block a user