Merge remote-tracking branch 'origin/master'

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -513,6 +513,14 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
             if ("null~null".equals(object)) {
                 object = "";
             }
+            if (object!= null ) {
+                String strObject = object.toString();
+                if (strObject.contains("null")) {
+                    strObject = strObject.replace("null", "");
+                    object =  strObject;
+                }
+            }
+
         }
         dataInfo.put(key, object);
     }
@@ -702,7 +710,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
 
         for (ArchiveFile file : datas) {
             String fileTime = file.getFileTime();
-            if (StringUtils.isNotEmpty(fileTime)) {
+            if (StringUtils.isNotEmpty(fileTime) && !fileTime.equals("null")) {
                 if (minDate.isEmpty() || fileTime.compareTo(minDate) <= 0) {
                     minDate = fileTime;
                 }
@@ -723,7 +731,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         if (!maxDate.isEmpty() && !maxDate.equals("null") ) {
             LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(maxDate, "yyyyMMdd");
             if (localDateTime != null) {
-                archive.setStartDate(localDateTime);
+                archive.setEndDate(localDateTime);
             }
         }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -667,12 +667,12 @@ public class ArchiveTreeContractSyncImpl {
         //文件大小
         archiveFile.setFileSize(query.getEVisaPdfSize());
 
-        if (query.getEVisaPdfSize() < 0L ) {
+        if (query.getEVisaPdfSize()!= null && query.getEVisaPdfSize() < 0L ) {
             archiveFile.setFileSize(0L);
         }else {
             archiveFile.setFileSize(query.getEVisaPdfSize());
         }
-        if (query.getEVisaPdfPage() < 0 ) {
+        if (query.getEVisaPdfPage()!= null && query.getEVisaPdfPage() < 0 ) {
             archiveFile.setFilePage(0);
         }else {
             archiveFile.setFilePage(query.getEVisaPdfPage());