|
@@ -41,10 +41,7 @@ import java.io.OutputStream;
|
|
|
import java.io.*;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Slf4j
|
|
@@ -825,6 +822,9 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
|
|
|
try {
|
|
|
if (file != null) {
|
|
|
url = file.getPdfFileUrl();
|
|
|
+ if(StringUtils.isNotEmpty(file.getEVisaFile())&& !Objects.equals(file.getPdfFileUrl(),file.getEVisaFile())){
|
|
|
+ url=file.getEVisaFile();
|
|
|
+ }
|
|
|
if (StringUtil.isEmpty(url)) {
|
|
|
String fileUrl = file.getFileUrl();
|
|
|
if (fileUrl != null && StringUtils.isNotEmpty(fileUrl) && fileUrl.endsWith(".pdf")) {
|