Просмотр исходного кода

Merge branch 'fix/restoreDate附件不存在的问题' into 'release'

[平台]修复restoreDate附件不存在的问题

See merge request o2oa/o2oa!1677
o2null 5 лет назад
Родитель
Сommit
df5ad3e198

+ 4 - 3
o2server/x_console/src/main/java/com/x/server/console/action/RestoreData.java

@@ -227,9 +227,10 @@ public class RestoreData {
 			Path path = sub.resolve(Paths.get(so.path()).getFileName());
 			Path path = sub.resolve(Paths.get(so.path()).getFileName());
 			if (!Files.exists(path)) {
 			if (!Files.exists(path)) {
 				logger.warn("file not exist: {}.", path.toString());
 				logger.warn("file not exist: {}.", path.toString());
-			}
-			try (InputStream input = Files.newInputStream(path)) {
-				so.saveContent(mapping, input, so.getName());
+			}else {
+				try (InputStream input = Files.newInputStream(path)) {
+					so.saveContent(mapping, input, so.getName());
+				}
 			}
 			}
 		}
 		}