|
@@ -1064,6 +1064,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
queryWrapper.in("node_id", ids)
|
|
|
.eq("is_deleted",0)
|
|
|
.eq("is_archive",1)
|
|
|
+ .ne("is_auto_file",1)
|
|
|
.orderByAsc("tree_sort")
|
|
|
.orderByAsc("auto_file_sort")
|
|
|
.orderByAsc("file_number");
|
|
@@ -1191,20 +1192,19 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
String back = "";
|
|
|
|
|
|
|
|
|
- for (String frontUrl : frontUrls) {
|
|
|
- if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[0]) && config.getFactorType().contains("1")) {
|
|
|
- front = frontUrl;
|
|
|
- }else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[1]) && config.getFactorType().contains("2")) {
|
|
|
- cataLog = frontUrl;
|
|
|
- }
|
|
|
- else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[2]) && config.getFactorType().contains("3")) {
|
|
|
- spare = frontUrl;
|
|
|
- }
|
|
|
- else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[3]) && config.getFactorType().contains("4")) {
|
|
|
- back = frontUrl;
|
|
|
+ if(frontUrls != null ) {
|
|
|
+ for (String frontUrl : frontUrls) {
|
|
|
+ if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[0]) && config.getFactorType().contains("1")) {
|
|
|
+ front = frontUrl;
|
|
|
+ } else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[1]) && config.getFactorType().contains("2")) {
|
|
|
+ cataLog = frontUrl;
|
|
|
+ } else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[2]) && config.getFactorType().contains("3")) {
|
|
|
+ spare = frontUrl;
|
|
|
+ } else if (frontUrl.contains(ArchiveAutoPdfServiceImpl.ARCHIVE_NUMBER[3]) && config.getFactorType().contains("4")) {
|
|
|
+ back = frontUrl;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
List<String> fileUrls =new ArrayList<>();
|
|
|
if (!archivesAuto.isMedia()) {
|
|
|
List<ArchiveFile> result = this.archiveFileClient.getArchiveFileByArchivesId(archivesAuto.getId().toString(),"");
|