Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java

@@ -98,6 +98,9 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
             List<String> fileNames = reportFileService.uploadFilesGetName(files);
             compareRecord.setFilePath(fileNames.get(0));
         }
+        if(compareRecord.getFilePath() == null){
+            compareRecord.setFilePath("");
+        }
         List<AssoRecordsFeature> assoRecordsFeatures = compareRecord.getAssoRecordsFeatures();
         List<Integer> nowIds =assoRecordsFeatures.stream().filter(item->item.getId()!=null).map(AssoRecordsFeature::getId).collect(Collectors.toList());
         //删除原本的记录-特征关联关系