Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -112,6 +112,9 @@ public class ArchiveFileAutoController extends BladeController {
                     archive.setIsDeleted(0);
                     archive.setIsArchive(1);
                     archive.setIsAutoFile(1);
+                    if(saveVos.getList() != null && saveVos.getList().size()>0 && saveVos.getList().get(0).getFileSize() != null) {
+                        archive.setFileSize(saveVos.getList().get(0).getFileSize());
+                    }
                     archivesAutoService.save(archive);
                 } else {
                     archivesAutoService.updateById(archive);

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -117,8 +117,11 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
         Collections.sort(listInt);
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setSort(listInt.get(i));
-            if(list.get(i).getIsUpdateUrl() == 1) {
+            if(list.get(i).getIsUpdateUrl() != null && list.get(i).getIsUpdateUrl() == 1) {
                 ids.append(list.get(i).getId() + ",");
+                if(list.get(i).getRectification() != null && list.get(i).getRectification() == 1){
+                    list.get(i).setRectification(2);
+                }
             }
         }
         if(ids != null && ids.length()>0){